diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2019-06-10 21:38:47 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-10 21:38:47 -0400 |
commit | 4e5c9b8cf4d2c583489cb387a755bfb2fef20461 (patch) | |
tree | fab90a7bf560dce960d7e32f5ac7347cfb3b3182 /pkgs/build-support | |
parent | ebd038dc2d617929e86376122224454a32b3474d (diff) | |
parent | 2890a38652fc6c4904856fde5bd4224ff2018827 (diff) | |
download | nixlib-4e5c9b8cf4d2c583489cb387a755bfb2fef20461.tar nixlib-4e5c9b8cf4d2c583489cb387a755bfb2fef20461.tar.gz nixlib-4e5c9b8cf4d2c583489cb387a755bfb2fef20461.tar.bz2 nixlib-4e5c9b8cf4d2c583489cb387a755bfb2fef20461.tar.lz nixlib-4e5c9b8cf4d2c583489cb387a755bfb2fef20461.tar.xz nixlib-4e5c9b8cf4d2c583489cb387a755bfb2fef20461.tar.zst nixlib-4e5c9b8cf4d2c583489cb387a755bfb2fef20461.zip |
Merge pull request #54921 from grabango/master
Use nativeBuildInputs for building Docker images
Diffstat (limited to 'pkgs/build-support')
-rw-r--r-- | pkgs/build-support/docker/default.nix | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 57e40069003a..ae000c2daefc 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -75,7 +75,7 @@ rec { # We need to sum layer.tar, not a directory, hence tarsum instead of nix-hash. # And we cannot untar it, because then we cannot preserve permissions ecc. tarsum = runCommand "tarsum" { - buildInputs = [ go ]; + nativeBuildInputs = [ go ]; } '' mkdir tarsum cd tarsum @@ -165,7 +165,7 @@ rec { }; inherit fromImage fromImageName fromImageTag; - buildInputs = [ utillinux e2fsprogs jshon rsync jq ]; + nativeBuildInputs = [ utillinux e2fsprogs jshon rsync jq ]; } '' rm -rf $out @@ -297,7 +297,7 @@ rec { runCommand "${name}-granular-docker-layers" { inherit maxLayers; paths = referencesByPopularity closure; - buildInputs = [ jshon rsync tarsum ]; + nativeBuildInputs = [ jshon rsync tarsum ]; enableParallelBuilding = true; } '' @@ -335,7 +335,7 @@ rec { uid ? 0, gid ? 0, }: runCommand "${name}-customisation-layer" { - buildInputs = [ jshon rsync tarsum ]; + nativeBuildInputs = [ jshon rsync tarsum ]; inherit extraCommands; } '' @@ -380,7 +380,7 @@ rec { }: runCommand "docker-layer-${name}" { inherit baseJson contents extraCommands; - buildInputs = [ jshon rsync tarsum ]; + nativeBuildInputs = [ jshon rsync tarsum ]; } '' mkdir layer @@ -535,7 +535,7 @@ rec { os = "linux"; }); impure = runCommand "${baseName}-standard-dynamic-date.json" - { buildInputs = [ jq ]; } + { nativeBuildInputs = [ jq ]; } '' jq ".created = \"$(TZ=utc date --iso-8601="seconds")\"" ${pure} > $out ''; @@ -556,7 +556,7 @@ rec { inherit uid gid extraCommands; }; result = runCommand "docker-image-${baseName}.tar.gz" { - buildInputs = [ jshon pigz coreutils findutils jq ]; + nativeBuildInputs = [ jshon pigz coreutils findutils jq ]; # Image name and tag must be lowercase imageName = lib.toLower name; baseJson = configJson; @@ -653,7 +653,7 @@ rec { os = "linux"; }); impure = runCommand "${baseName}-config.json" - { buildInputs = [ jq ]; } + { nativeBuildInputs = [ jq ]; } '' jq ".created = \"$(TZ=utc date --iso-8601="seconds")\"" ${pure} > $out ''; @@ -671,7 +671,7 @@ rec { extraCommands; }; result = runCommand "docker-image-${baseName}.tar.gz" { - buildInputs = [ jshon pigz coreutils findutils jq ]; + nativeBuildInputs = [ jshon pigz coreutils findutils jq ]; # Image name and tag must be lowercase imageName = lib.toLower name; imageTag = if tag == null then "" else lib.toLower tag; |