diff options
| author | Timo Kaufmann <timokau@zoho.com> | 2018-10-10 19:29:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-10 19:29:09 +0200 |
| commit | 1aff3da14e85e1bd6617a8a7edb6e1f4cd51b300 (patch) | |
| tree | 4291cd5641d86c068333154797fe07542d25ee19 /pkgs/build-support | |
| parent | bc9bd012c4ba75df94a688b281369a1b433d1264 (diff) | |
| parent | 64d0676fe1cafc47d710f0e62ff1139814e314ad (diff) | |
| download | nixlib-1aff3da14e85e1bd6617a8a7edb6e1f4cd51b300.tar nixlib-1aff3da14e85e1bd6617a8a7edb6e1f4cd51b300.tar.gz nixlib-1aff3da14e85e1bd6617a8a7edb6e1f4cd51b300.tar.bz2 nixlib-1aff3da14e85e1bd6617a8a7edb6e1f4cd51b300.tar.lz nixlib-1aff3da14e85e1bd6617a8a7edb6e1f4cd51b300.tar.xz nixlib-1aff3da14e85e1bd6617a8a7edb6e1f4cd51b300.tar.zst nixlib-1aff3da14e85e1bd6617a8a7edb6e1f4cd51b300.zip | |
Merge pull request #48020 from erictapen/47709-fix-regex
buildRustPackage: fix regex for separating lib and bin
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/rust/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index ec4514121c24..5fdcf520440e 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -92,8 +92,8 @@ in stdenv.mkDerivation (args // { installPhase = args.installPhase or '' runHook preInstall 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 + 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 ''; |