diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-02-14 21:30:08 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-02-14 21:30:08 +0100 |
| commit | 672bb6b4abd27d9b2796152522b54f5b82c9f76b (patch) | |
| tree | 5b6989f6f2e3bfea9673efa21ef30aa722ad001e /pkgs/build-support | |
| parent | e4bfe5aac94ce07115ea068e6b235ddf6e8e71ac (diff) | |
| parent | 303c9794362acec6ce0142b8bcf878202717c99c (diff) | |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/docker/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/build-support/rust/build-rust-crate.nix | 1 |
2 files changed, 1 insertions, 2 deletions
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 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 |