diff options
Diffstat (limited to 'release-combined.nix')
-rw-r--r-- | release-combined.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/release-combined.nix b/release-combined.nix index b26a2184ddb..3a378123d2c 100644 --- a/release-combined.nix +++ b/release-combined.nix @@ -1,17 +1,20 @@ { nixosSrc ? { outPath = ./.; revCount = 1234; shortRev = "abcdefg"; } -, nixpkgsSrc ? { outPath = <nixpkgs>; revCount = 5678; shortRev = "gfedcba"; } +, nixpkgs ? { outPath = <nixpkgs>; revCount = 5678; shortRev = "gfedcba"; } , officialRelease ? false }: +let nixpkgs' = nixpkgs; in # urgh + rec { nixos = import ./release.nix { - inherit nixosSrc nixpkgsSrc officialRelease; + inherit nixosSrc officialRelease; + nixpkgs = nixpkgs'; }; nixpkgs = import <nixpkgs/pkgs/top-level/release.nix> { inherit officialRelease; - nixpkgs = nixpkgsSrc; + nixpkgs = nixpkgs'; # Only do Linux builds. supportedSystems = [ "x86_64-linux" "i686-linux" ]; }; |