From e1053cb07119f6fcfd742914276421dffb35e06d Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 19 Mar 2020 09:39:14 +0100 Subject: [PATCH 01/10] librustzcash: improve robustness of installPhase --- pkgs/applications/blockchains/zcash/librustzcash/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/blockchains/zcash/librustzcash/default.nix b/pkgs/applications/blockchains/zcash/librustzcash/default.nix index 6cd2ae018fb..526adc715d4 100644 --- a/pkgs/applications/blockchains/zcash/librustzcash/default.nix +++ b/pkgs/applications/blockchains/zcash/librustzcash/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { installPhase = '' mkdir -p $out/lib - cp target/release/librustzcash.a $out/lib/ + cp $releaseDir/librustzcash.a $out/lib/ mkdir -p $out/include cp librustzcash/include/librustzcash.h $out/include/ ''; From 8b2abebb236437262155d3eb0c0a80dbc8c6bf21 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Thu, 19 Mar 2020 23:44:58 -0700 Subject: [PATCH 02/10] alacritty: improve robustness of installPhase --- pkgs/applications/misc/alacritty/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index b6248b8f6f1..a4b35573fc7 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -95,7 +95,7 @@ rustPlatform.buildRustPackage rec { installPhase = '' runHook preInstall - install -D target/release/alacritty $out/bin/alacritty + install -D $releaseDir/alacritty $out/bin/alacritty '' + ( if stdenv.isDarwin then '' From 59ef82a28a76505bda4ef53a866b10205f5c24ce Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Thu, 19 Mar 2020 23:45:29 -0700 Subject: [PATCH 03/10] cfdyndns: improve robustness of installPhase --- pkgs/applications/networking/dyndns/cfdyndns/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/dyndns/cfdyndns/default.nix b/pkgs/applications/networking/dyndns/cfdyndns/default.nix index e72f50cd29b..60a7e5b2fb2 100644 --- a/pkgs/applications/networking/dyndns/cfdyndns/default.nix +++ b/pkgs/applications/networking/dyndns/cfdyndns/default.nix @@ -19,7 +19,7 @@ buildRustPackage rec { installPhase = '' mkdir -p $out/bin - cp -p target/release/cfdyndns $out/bin/ + cp -p $releaseDir/cfdyndns $out/bin/ ''; meta = with stdenv.lib; { From 3d1824896fc2c25863a23b0da2f63aa07b129257 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Thu, 19 Mar 2020 23:45:53 -0700 Subject: [PATCH 04/10] gitAndTools.git-ignore: improve robustness --- .../git-and-tools/git-ignore/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix b/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix index 5c3b27ad614..93d152baa00 100644 --- a/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, darwin }: +{ stdenv, fetchFromGitHub, installShellFiles, rustPlatform, pkgconfig, openssl, darwin }: with rustPlatform; @@ -15,7 +15,7 @@ buildRustPackage rec { cargoSha256 = "0vcg2pl0s329fr8p23pwdx2jy7qahbr7n337ib61f69aaxi1xmq0"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig installShellFiles ]; buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security @@ -23,8 +23,7 @@ buildRustPackage rec { outputs = [ "out" "man" ]; preFixup = '' - mkdir -p "$man/man/man1" - cp target/release/build/git-ignore-*/out/git-ignore.1 "$man/man/man1/" + installManPage $releaseDir/build/git-ignore-*/out/git-ignore.1 ''; meta = with stdenv.lib; { From 0cc340e1328115d5991a04fbe34cf16f0e784844 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Thu, 19 Mar 2020 23:46:15 -0700 Subject: [PATCH 05/10] rustracerd: improve robustness of installPhase --- pkgs/development/tools/rust/racerd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/rust/racerd/default.nix b/pkgs/development/tools/rust/racerd/default.nix index 02b32c6485e..72588b37415 100644 --- a/pkgs/development/tools/rust/racerd/default.nix +++ b/pkgs/development/tools/rust/racerd/default.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { installPhase = '' mkdir -p $out/bin - cp -p target/release/racerd $out/bin/ + cp -p $releaseDir/racerd $out/bin/ wrapProgram $out/bin/racerd --set-default RUST_SRC_PATH "$RUST_SRC_PATH" ''; From 120b5a2c319e33edbe0e94d4f64dfe8355a6092a Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Thu, 19 Mar 2020 23:46:39 -0700 Subject: [PATCH 06/10] broot: improve robustness of installPhase --- pkgs/tools/misc/broot/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index 5d31570aacd..7ec0d533c0d 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 From e4383ce1fb9ca24b432df0b4c3069debf0758013 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Thu, 19 Mar 2020 23:46:50 -0700 Subject: [PATCH 07/10] fd: improve robustness of build --- pkgs/tools/misc/fd/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix index 060e1c3fcdf..20a2de74d27 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; { From 699103e2dabb6993615381f8f626619ec0a3d6d5 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Thu, 19 Mar 2020 23:46:58 -0700 Subject: [PATCH 08/10] lsd: improve robustness of build --- pkgs/tools/misc/lsd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/lsd/default.nix b/pkgs/tools/misc/lsd/default.nix index 6291ad013ea..73dcbd3bc3c 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; { From 857bf884f4dfc4d34dba01200159b502ec03e8dc Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Thu, 19 Mar 2020 23:47:12 -0700 Subject: [PATCH 09/10] tox-node: improve robustness of installPhase --- pkgs/tools/networking/tox-node/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/tox-node/default.nix b/pkgs/tools/networking/tox-node/default.nix index 1124c2ab557..feeceef81f4 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 ''; From 21b5e7d6f65dfbcd60570f5b7ee3624fa6f97e0a Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Thu, 19 Mar 2020 23:47:20 -0700 Subject: [PATCH 10/10] ripgrep: improve robustness of build --- pkgs/tools/text/ripgrep/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix index c794b4ba33c..9eba451c54a 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" '';