diff options
| author | Sarah Brofeldt <sbrofeldt@gmail.com> | 2018-10-01 09:51:52 +0200 |
|---|---|---|
| committer | Sarah Brofeldt <sbrofeldt@gmail.com> | 2018-10-01 09:51:52 +0200 |
| commit | b256df49375add87b0ec5ddd82092e0e2ff45aac (patch) | |
| tree | 4b18fc1cc94f34af28e35fb0be2b4c54b6f37089 /pkgs/build-support/docker | |
| parent | 56b4db9710ffddfe6efcf4c153123725e0f2aa2c (diff) | |
| download | nixpkgs-b256df49375add87b0ec5ddd82092e0e2ff45aac.tar nixpkgs-b256df49375add87b0ec5ddd82092e0e2ff45aac.tar.gz nixpkgs-b256df49375add87b0ec5ddd82092e0e2ff45aac.tar.bz2 nixpkgs-b256df49375add87b0ec5ddd82092e0e2ff45aac.tar.lz nixpkgs-b256df49375add87b0ec5ddd82092e0e2ff45aac.tar.xz nixpkgs-b256df49375add87b0ec5ddd82092e0e2ff45aac.tar.zst nixpkgs-b256df49375add87b0ec5ddd82092e0e2ff45aac.zip | |
dockerTools: Use nix instead of nixUnstable
Diffstat (limited to 'pkgs/build-support/docker')
| -rw-r--r-- | pkgs/build-support/docker/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 73639a521b6..2d6d6c1fc91 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -10,7 +10,7 @@ lib, pkgs, pigz, - nixUnstable, + nix, perl, runCommand, rsync, @@ -262,7 +262,7 @@ rec { ''; nixRegistration = contents: runCommand "nix-registration" { - buildInputs = [ nixUnstable perl ]; + buildInputs = [ nix perl ]; # For obtaining the closure of `contents'. exportReferencesGraph = let contentsList = if builtins.isList contents then contents else [ contents ]; @@ -803,7 +803,7 @@ rec { echo " be better to only have one layer that contains a nix store." # This requires Nix 1.12 or higher export NIX_REMOTE=local?root=$PWD - ${nixUnstable}/bin/nix-store --load-db < ${nixRegistration contents}/db.dump + ${nix}/bin/nix-store --load-db < ${nixRegistration contents}/db.dump # We fill the store in order to run the 'verify' command that # generates hash and size of output paths. @@ -814,7 +814,7 @@ rec { storePaths=$(cat ${nixRegistration contents}/storePaths) echo "Copying everything to /nix/store (will take a while)..." cp -prd $storePaths nix/store/ - ${nixUnstable}/bin/nix-store --verify --check-contents + ${nix}/bin/nix-store --verify --check-contents mkdir -p nix/var/nix/gcroots/docker/ for i in ${lib.concatStringsSep " " contents}; do |