firefox: re-enable betterttv, fix unfree packages in hydra

2 files changed, 22 insertions, 2 deletions

diff --git a/common/default.nix b/common/default.nix
index c2caaaf..b94f0dc 100644
--- a/common/default.nix
+++ b/common/default.nix
@@ -1,6 +1,6 @@
 inputs:
 
-{ config, ... }:
+{ config, lib, ... }:
 
 {
   imports = [
@@ -10,13 +10,18 @@ inputs:
     (import ./ssh.nix inputs)
     (import ./theme.nix inputs)
     (import ./tinc.nix inputs)
+    (import ./unfree.nix inputs)
     (import ./vim.nix inputs)
     (import ./zram.nix inputs)
   ];
 
   nixpkgs.overlays = [
     (final: prev: {
-      unstable = inputs.nixpkgs-unstable.legacyPackages.${config.nixpkgs.system};
+      # Inheriting config allows adding unfree package using the option
+      # nixpkgs.config.allowUnfreePredicate
+      unstable = import inputs.nixpkgs-unstable {
+        inherit (config.nixpkgs) system config;
+      };
     })
     inputs.nur.overlay
   ];
diff --git a/common/unfree.nix b/common/unfree.nix
new file mode 100644
index 0000000..b07b151
--- /dev/null
+++ b/common/unfree.nix
@@ -0,0 +1,15 @@
+inputs:
+
+{ lib, ... }:
+
+{
+  # List accepted unfree packages in a common place, since somehow the merge
+  # operation of this attribute is broken
+  nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
+    "betterttv"
+
+    "steam"
+    "steam-original"
+    "steam-runtime"
+  ];
+}