Skip to content
This repository has been archived by the owner on Apr 12, 2021. It is now read-only.

Commit

Permalink
dockerTools: Use nix instead of nixUnstable
Browse files Browse the repository at this point in the history
  • Loading branch information
srhb committed Oct 1, 2018
1 parent 56b4db9 commit b256df4
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions pkgs/build-support/docker/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
lib,
pkgs,
pigz,
nixUnstable,
nix,
perl,
runCommand,
rsync,
Expand Down Expand Up @@ -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 ];
Expand Down Expand Up @@ -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.
Expand All @@ -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
Expand Down

0 comments on commit b256df4

Please sign in to comment.