From a5cabdb6b11dccdc62f2085868d2d2ec40338d0b Mon Sep 17 00:00:00 2001 From: Stewart Mackenzie Date: Tue, 13 Feb 2018 18:28:32 +0200 Subject: buildRustCrate: add a postInstall phase (#34906) --- pkgs/build-support/rust/build-rust-crate.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/build-support') diff --git a/pkgs/build-support/rust/build-rust-crate.nix b/pkgs/build-support/rust/build-rust-crate.nix index e36fab36bf975..f1f344ca3c7dd 100644 --- a/pkgs/build-support/rust/build-rust-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate.nix @@ -291,6 +291,7 @@ let buildCrate = { crateName, crateVersion, crateAuthors, buildDependencies, mkdir -p $out/bin cp -P target/bin/* $out/bin # */ fi + runHook postInstall ''; in -- cgit 1.4.1 From ce838e52b94f64a43b02fbcd0ed6b348b2f56e33 Mon Sep 17 00:00:00 2001 From: Antoine Eiche Date: Tue, 13 Feb 2018 10:44:59 +0100 Subject: dockerTools.buildImage: do not add /nix/store in the tar stream Since the /nix/store directory is not immutable, tar can fails if it has to push it into the layer archive. Fixes #34137. --- pkgs/build-support/docker/default.nix | 2 -- 1 file changed, 2 deletions(-) (limited to 'pkgs/build-support') diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 68b803f6e3ccf..c40b096e20886 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -476,8 +476,6 @@ rec { cp ${layer}/* temp/ chmod ug+w temp/* - echo "$(dirname ${storeDir})" >> layerFiles - echo '${storeDir}' >> layerFiles for dep in $(cat $layerClosure); do find $dep >> layerFiles done -- cgit 1.4.1