diff options
author | adisbladis <adisbladis@gmail.com> | 2020-11-19 14:31:14 +0100 |
---|---|---|
committer | adisbladis <adisbladis@gmail.com> | 2020-11-19 14:32:22 +0100 |
commit | 4313ac6b292708158cb413420c8848f7b8012305 (patch) | |
tree | b1537e9bfb971f5719d3921615f0c85e38e08e25 | |
parent | ba093e25d466ffdbe43b1967eb2057649887b55e (diff) |
dockerTools.buildLayeredImage: Fix cross compilation
-rw-r--r-- | pkgs/build-support/docker/default.nix | 8 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index ba76ce2b817d..b072c291f77f 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -48,7 +48,7 @@ let # A user is required by nix # https://github.com/NixOS/nix/blob/9348f9291e5d9e4ba3c4347ea1b235640f54fd79/src/libutil/util.cc#L478 export USER=nobody - ${nix}/bin/nix-store --load-db < ${closureInfo {rootPaths = contentsList;}}/registration + ${buildPackages.nix}/bin/nix-store --load-db < ${closureInfo {rootPaths = contentsList;}}/registration mkdir -p nix/var/nix/gcroots/docker/ for i in ${lib.concatStringsSep " " contentsList}; do @@ -443,7 +443,7 @@ rec { runCommand "${name}.tar.gz" { inherit (stream) imageName; passthru = { inherit (stream) imageTag; }; - buildInputs = [ pigz ]; + nativeBuildInputs = [ pigz ]; } "${stream} | pigz -nT > $out"; # 1. extract the base image @@ -762,7 +762,7 @@ rec { else lib.head (lib.strings.splitString "-" (baseNameOf conf.outPath)); paths = referencesByPopularity overallClosure; - buildInputs = [ jq ]; + nativeBuildInputs = [ jq ]; } '' ${if (tag == null) then '' outName="$(basename "$out")" @@ -826,7 +826,7 @@ rec { # take images can know in advance how the image is supposed to be used. isExe = true; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; } '' makeWrapper ${streamScript} $out --add-flags ${conf} ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 372aecc9668b..7391f0d12a02 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -239,7 +239,7 @@ in grsync = callPackage ../applications/misc/grsync { }; dockerTools = callPackage ../build-support/docker { - writePython3 = writers.writePython3; + writePython3 = buildPackages.writers.writePython3; }; snapTools = callPackage ../build-support/snap { }; |