From 0ead1204a060c707754dbe93868ffc9c036d9766 Mon Sep 17 00:00:00 2001
From: guangtao <gtrunsec@hardenedlinux.org>
Date: Thu, 19 Oct 2023 20:09:29 -0700
Subject: [PATCH] refactor: deSys with nixpkgs.legacyPackages

---
 src/flake/pops.nix   | 11 ++++++++++-
 tests/flake/expr.nix |  4 +---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/flake/pops.nix b/src/flake/pops.nix
index 7fc0559..21cd8b8 100644
--- 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
index 3dc5462..e8a2a09 100644
--- 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