Skip to content

Commit

Permalink
dockerTools: Use nix instead of nixUnstable
Browse files Browse the repository at this point in the history
(cherry picked from commit b256df4)
  • Loading branch information
srhb authored and nlewo committed Oct 1, 2018
1 parent b550b7d commit ff37ba7
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions pkgs/build-support/docker/default.nix
Expand Up @@ -9,7 +9,7 @@
lib,
pkgs,
pigz,
nixUnstable,
nix,
perl,
runCommand,
rsync,
Expand Down Expand Up @@ -258,7 +258,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 ];
Expand Down Expand Up @@ -626,7 +626,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.
Expand All @@ -637,7 +637,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
Expand Down

0 comments on commit ff37ba7

Please sign in to comment.