refactor: deSys with nixpkgs.legacyPackages

tao3k · Oct 20, 2023 · 0ead120 · 0ead120
1 parent cfc0e28
commit 0ead120
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/src/flake/pops.nix b/src/flake/pops.nix
@@ -103,7 +103,16 @@ in
     extension =
       self: super:
       let
-        deSysInputs = mapAttrs (_: input: deSystemize self.system input) extendedInputs;
+        deSysInputs =
+          mapAttrs
+            (
+              name: input:
+              if (name == "nixpkgs" && input ? legacyPackages) then
+                (deSystemize self.system input).legacyPackages
+              else
+                deSystemize self.system input
+            )
+            extendedInputs;
 
         extendedInputs =
           foldl

diff --git a/tests/flake/expr.nix b/tests/flake/expr.nix
@@ -24,9 +24,7 @@ let
       ]).addExporters
         [
           (POP.lib.extendPop pops.exporter (
-            self: _: {
-              exports.packages.firefox = self.inputs.nixpkgs.legacyPackages.firefox;
-            }
+            self: _: { exports.packages.firefox = self.inputs.nixpkgs.firefox; }
           ))
         ]
       ).outputsForSystems