diff options
author | Edward Tate <cmalune@gmail.com> | 2018-09-30 16:03:35 +0200 |
---|---|---|
committer | Andreas Rammhold <andreas@rammhold.de> | 2018-10-03 16:27:10 +0200 |
commit | 6ad43a0bce3603b25bcadb458d39701616d245f4 (patch) | |
tree | c645c8adecfc767632ebbcc6d2d20c1c6b239017 /pkgs | |
parent | aef6830d3e59d554dea2cb96c07326922cffe416 (diff) | |
download | nixlib-6ad43a0bce3603b25bcadb458d39701616d245f4.tar nixlib-6ad43a0bce3603b25bcadb458d39701616d245f4.tar.gz nixlib-6ad43a0bce3603b25bcadb458d39701616d245f4.tar.bz2 nixlib-6ad43a0bce3603b25bcadb458d39701616d245f4.tar.lz nixlib-6ad43a0bce3603b25bcadb458d39701616d245f4.tar.xz nixlib-6ad43a0bce3603b25bcadb458d39701616d245f4.tar.zst nixlib-6ad43a0bce3603b25bcadb458d39701616d245f4.zip |
buildRustPackage now correctly installs binaries to bin and libraries to lib.
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/build-support/rust/default.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 1d5de052f893..ec4514121c24 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -91,8 +91,10 @@ in stdenv.mkDerivation (args // { installPhase = args.installPhase or '' runHook preInstall - mkdir -p $out/bin - find target/release -maxdepth 1 -executable -type f -exec cp "{}" $out/bin \; + mkdir -p $out/bin $out/lib + find target/release -maxdepth 1 -type f -executable ! \( -regex ".*.\(so.[0-9.]+\|so\|a\|dylib\)" \) -print0 | xargs -r -0 cp -t $out/bin + find target/release -maxdepth 1 -regex ".*.\(so.[0-9.]+\|so\|a\|dylib\)" -print0 | xargs -r -0 cp -t $out/lib + rmdir --ignore-fail-on-non-empty $out/lib $out/bin runHook postInstall ''; |