diff options
| author | Justin Humm <justin.humm@posteo.de> | 2018-10-07 22:14:19 +0200 |
|---|---|---|
| committer | Justin Humm <justin.humm@posteo.de> | 2018-10-07 22:14:19 +0200 |
| commit | 64d0676fe1cafc47d710f0e62ff1139814e314ad (patch) | |
| tree | d92f0e3179dd8d973408bb176c33e9698518a728 /pkgs/build-support | |
| parent | c606de191f8c83976c80c2092cb4fb620e3a0cff (diff) | |
| download | nixlib-64d0676fe1cafc47d710f0e62ff1139814e314ad.tar nixlib-64d0676fe1cafc47d710f0e62ff1139814e314ad.tar.gz nixlib-64d0676fe1cafc47d710f0e62ff1139814e314ad.tar.bz2 nixlib-64d0676fe1cafc47d710f0e62ff1139814e314ad.tar.lz nixlib-64d0676fe1cafc47d710f0e62ff1139814e314ad.tar.xz nixlib-64d0676fe1cafc47d710f0e62ff1139814e314ad.tar.zst nixlib-64d0676fe1cafc47d710f0e62ff1139814e314ad.zip | |
buildRustPackage: fix regex for separating lib and bin
E.g. exa was wrongly put into /lib, as it matches .*.a but not .*\.a
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 ''; |