diff --git a/pkgs/top-level/splice.nix b/pkgs/top-level/splice.nix index ec6ed357c688b..e731731104ef5 100644 --- a/pkgs/top-level/splice.nix +++ b/pkgs/top-level/splice.nix @@ -21,7 +21,7 @@ # For performance reasons, rather than uniformally splice in all cases, we only # do so when `pkgs` and `buildPackages` are distinct. The `actuallySplice` # parameter there the boolean value of that equality check. -lib: pkgs: actuallySplice: +lib: config: pkgs: actuallySplice: let @@ -126,9 +126,9 @@ in # `newScope' for sets of packages in `pkgs' (see e.g. `gnome' below). callPackage = pkgs.newScope {}; - callPackages = lib.callPackagesWith splicedPackagesWithXorg; + callPackages = lib.callPackagesWith (splicedPackagesWithXorg // (config.poorMansUseFlags or {})); - newScope = extra: lib.callPackageWith (splicedPackagesWithXorg // extra); + newScope = extra: lib.callPackageWith (splicedPackagesWithXorg // (config.poorMansUseFlags or {}) // extra); # Haskell package sets need this because they reimplement their own # `newScope`. diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 6ca370e0b9b77..b94aa57664c01 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -86,7 +86,7 @@ let inherit (hostPlatform) system; }; - splice = self: super: import ./splice.nix lib self (buildPackages != null); + splice = self: super: import ./splice.nix lib config self (buildPackages != null); allPackages = self: super: let res = import ./all-packages.nix