diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix index a6e574a7d11..59d571f0bd1 100644 --- a/pkgs/top-level/release-lib.nix +++ b/pkgs/top-level/release-lib.nix @@ -1,17 +1,15 @@ { supportedSystems , packageSet ? (import ../..) , scrubJobs ? true +, # Attributes passed to nixpkgs. Don't build packages marked as unfree. + nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; }; } }: with import ../../lib; rec { - # Ensure that we don't build packages marked as unfree. - allPackages = args: packageSet (args // { - config.allowUnfree = false; - config.inHydra = true; - }); + allPackages = args: packageSet (args // nixpkgsArgs); pkgs = pkgsFor "x86_64-linux"; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 7c6954564d0..66ff9a9e6b9 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -15,9 +15,11 @@ supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ] , # Strip most of attributes when evaluating to spare memory usage scrubJobs ? true +, # Attributes passed to nixpkgs. Don't build packages marked as unfree. + nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; }; } }: -with import ./release-lib.nix { inherit supportedSystems scrubJobs; }; +with import ./release-lib.nix { inherit supportedSystems scrubJobs nixpkgsArgs; }; let