diff options
author | Maximilian Bosch <maximilian@mbosch.me> | 2020-04-30 02:07:57 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-30 02:07:57 +0200 |
commit | ee58c7a36319f031b23c675a22cd9d9bffc5f5c2 (patch) | |
tree | 90f05d5f9c8877e0a541f54cb4fa174f211ff7b0 /pkgs/tools | |
parent | 8e4e6fcf9dc9a1568cd83c33310bcc899c733a39 (diff) | |
parent | 21b5e7d6f65dfbcd60570f5b7ee3624fa6f97e0a (diff) | |
download | nixlib-ee58c7a36319f031b23c675a22cd9d9bffc5f5c2.tar nixlib-ee58c7a36319f031b23c675a22cd9d9bffc5f5c2.tar.gz nixlib-ee58c7a36319f031b23c675a22cd9d9bffc5f5c2.tar.bz2 nixlib-ee58c7a36319f031b23c675a22cd9d9bffc5f5c2.tar.lz nixlib-ee58c7a36319f031b23c675a22cd9d9bffc5f5c2.tar.xz nixlib-ee58c7a36319f031b23c675a22cd9d9bffc5f5c2.tar.zst nixlib-ee58c7a36319f031b23c675a22cd9d9bffc5f5c2.zip |
Merge pull request #82982 from cole-h/rust-cleanup
improve robustness of various Rust packages
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/misc/broot/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/misc/fd/default.nix | 5 | ||||
-rw-r--r-- | pkgs/tools/misc/lsd/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/networking/tox-node/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/text/ripgrep/default.nix | 6 |
5 files changed, 8 insertions, 9 deletions
diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index 5d31570aacd5..7ec0d533c0d5 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { postInstall = '' # install shell completion files - OUT_DIR=target/release/build/broot-*/out + OUT_DIR=$releaseDir/build/broot-*/out installShellCompletion --bash $OUT_DIR/{br,broot}.bash installShellCompletion --fish $OUT_DIR/{br,broot}.fish diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix index 5cc1c12f64c3..ab94a8aa6b54 100644 --- a/pkgs/tools/misc/fd/default.nix +++ b/pkgs/tools/misc/fd/default.nix @@ -18,9 +18,8 @@ rustPlatform.buildRustPackage rec { preFixup = '' installManPage "$src/doc/fd.1" - (cd target/release/build/fd-find-*/out - installShellCompletion fd.{bash,fish} - installShellCompletion --zsh _fd) + installShellCompletion $releaseDir/build/fd-find-*/out/fd.{bash,fish} + installShellCompletion --zsh $releaseDir/build/fd-find-*/out/_fd ''; meta = with lib; { diff --git a/pkgs/tools/misc/lsd/default.nix b/pkgs/tools/misc/lsd/default.nix index 6291ad013ea5..73dcbd3bc3cb 100644 --- a/pkgs/tools/misc/lsd/default.nix +++ b/pkgs/tools/misc/lsd/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; postInstall = '' - installShellCompletion target/release/build/lsd-*/out/{_lsd,lsd.{bash,fish}} + installShellCompletion $releaseDir/build/lsd-*/out/{_lsd,lsd.{bash,fish}} ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/tox-node/default.nix b/pkgs/tools/networking/tox-node/default.nix index 1124c2ab5575..feeceef81f45 100644 --- a/pkgs/tools/networking/tox-node/default.nix +++ b/pkgs/tools/networking/tox-node/default.nix @@ -24,7 +24,7 @@ buildRustPackage rec { installPhase = '' runHook preInstall - install -D target/release/tox-node $out/bin/tox-node + install -D $releaseDir/tox-node $out/bin/tox-node runHook postInstall ''; diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix index c794b4ba33c7..9eba451c54a3 100644 --- a/pkgs/tools/text/ripgrep/default.nix +++ b/pkgs/tools/text/ripgrep/default.nix @@ -30,9 +30,9 @@ rustPlatform.buildRustPackage rec { ++ (stdenv.lib.optional stdenv.isDarwin Security); preFixup = '' - (cd target/release/build/ripgrep-*/out - installManPage rg.1 - installShellCompletion rg.{bash,fish}) + installManPage $releaseDir/build/ripgrep-*/out/rg.1 + + installShellCompletion $releaseDir/build/ripgrep-*/out/rg.{bash,fish} installShellCompletion --zsh "$src/complete/_rg" ''; |