diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2018-10-18 11:23:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-18 11:23:04 +0200 |
| commit | 821a3beb1048273bbba5e9636916281fce5dd577 (patch) | |
| tree | 04bd7ec85b66e30e0c0a94b09aa416d4cec7cd74 /pkgs/build-support | |
| parent | 5143e303619dd21e134d036667d4f2316b6e8a27 (diff) | |
| parent | 18fcc337affa09238a42e9a0ca21e08363c65eeb (diff) | |
| download | nixlib-821a3beb1048273bbba5e9636916281fce5dd577.tar nixlib-821a3beb1048273bbba5e9636916281fce5dd577.tar.gz nixlib-821a3beb1048273bbba5e9636916281fce5dd577.tar.bz2 nixlib-821a3beb1048273bbba5e9636916281fce5dd577.tar.lz nixlib-821a3beb1048273bbba5e9636916281fce5dd577.tar.xz nixlib-821a3beb1048273bbba5e9636916281fce5dd577.tar.zst nixlib-821a3beb1048273bbba5e9636916281fce5dd577.zip | |
Merge pull request #48306 from NixOS/staging-next
Merge staging-next into master
Diffstat (limited to 'pkgs/build-support')
| -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..5fdcf520440e 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 ''; |