pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #82982 from cole-h/rust-cleanup

improve robustness of various Rust packages

authored by Maximilian Bosch and committed by GitHub ee58c7a3 8e4e6fcf

+15 -17
unified split
+1 -1
pkgs/applications/blockchains/zcash/librustzcash/default.nix
··· 15 16 installPhase = '' 17 mkdir -p $out/lib 18 - cp target/release/librustzcash.a $out/lib/ 19 mkdir -p $out/include 20 cp librustzcash/include/librustzcash.h $out/include/ 21 '';
··· 15 16 installPhase = '' 17 mkdir -p $out/lib 18 + cp $releaseDir/librustzcash.a $out/lib/ 19 mkdir -p $out/include 20 cp librustzcash/include/librustzcash.h $out/include/ 21 '';
+1 -1
pkgs/applications/misc/alacritty/default.nix
··· 95 installPhase = '' 96 runHook preInstall 97 98 - install -D target/release/alacritty $out/bin/alacritty 99 100 '' + ( 101 if stdenv.isDarwin then ''
··· 95 installPhase = '' 96 runHook preInstall 97 98 + install -D $releaseDir/alacritty $out/bin/alacritty 99 100 '' + ( 101 if stdenv.isDarwin then ''
+1 -1
pkgs/applications/networking/dyndns/cfdyndns/default.nix
··· 19 20 installPhase = '' 21 mkdir -p $out/bin 22 - cp -p target/release/cfdyndns $out/bin/ 23 ''; 24 25 meta = with stdenv.lib; {
··· 19 20 installPhase = '' 21 mkdir -p $out/bin 22 + cp -p $releaseDir/cfdyndns $out/bin/ 23 ''; 24 25 meta = with stdenv.lib; {
+3 -4
pkgs/applications/version-management/git-and-tools/git-ignore/default.nix
··· 1 - { stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, darwin }: 2 3 with rustPlatform; 4 ··· 15 16 cargoSha256 = "0vcg2pl0s329fr8p23pwdx2jy7qahbr7n337ib61f69aaxi1xmq0"; 17 18 - nativeBuildInputs = [ pkgconfig ]; 19 buildInputs = [ openssl ] 20 ++ stdenv.lib.optionals stdenv.isDarwin [ 21 darwin.apple_sdk.frameworks.Security ··· 23 24 outputs = [ "out" "man" ]; 25 preFixup = '' 26 - mkdir -p "$man/man/man1" 27 - cp target/release/build/git-ignore-*/out/git-ignore.1 "$man/man/man1/" 28 ''; 29 30 meta = with stdenv.lib; {
··· 1 + { stdenv, fetchFromGitHub, installShellFiles, rustPlatform, pkgconfig, openssl, darwin }: 2 3 with rustPlatform; 4 ··· 15 16 cargoSha256 = "0vcg2pl0s329fr8p23pwdx2jy7qahbr7n337ib61f69aaxi1xmq0"; 17 18 + nativeBuildInputs = [ pkgconfig installShellFiles ]; 19 buildInputs = [ openssl ] 20 ++ stdenv.lib.optionals stdenv.isDarwin [ 21 darwin.apple_sdk.frameworks.Security ··· 23 24 outputs = [ "out" "man" ]; 25 preFixup = '' 26 + installManPage $releaseDir/build/git-ignore-*/out/git-ignore.1 27 ''; 28 29 meta = with stdenv.lib; {
+1 -1
pkgs/development/tools/rust/racerd/default.nix
··· 32 33 installPhase = '' 34 mkdir -p $out/bin 35 - cp -p target/release/racerd $out/bin/ 36 wrapProgram $out/bin/racerd --set-default RUST_SRC_PATH "$RUST_SRC_PATH" 37 ''; 38
··· 32 33 installPhase = '' 34 mkdir -p $out/bin 35 + cp -p $releaseDir/racerd $out/bin/ 36 wrapProgram $out/bin/racerd --set-default RUST_SRC_PATH "$RUST_SRC_PATH" 37 ''; 38
+1 -1
pkgs/tools/misc/broot/default.nix
··· 23 24 postInstall = '' 25 # install shell completion files 26 - OUT_DIR=target/release/build/broot-*/out 27 28 installShellCompletion --bash $OUT_DIR/{br,broot}.bash 29 installShellCompletion --fish $OUT_DIR/{br,broot}.fish
··· 23 24 postInstall = '' 25 # install shell completion files 26 + OUT_DIR=$releaseDir/build/broot-*/out 27 28 installShellCompletion --bash $OUT_DIR/{br,broot}.bash 29 installShellCompletion --fish $OUT_DIR/{br,broot}.fish
+2 -3
pkgs/tools/misc/fd/default.nix
··· 18 preFixup = '' 19 installManPage "$src/doc/fd.1" 20 21 - (cd target/release/build/fd-find-*/out 22 - installShellCompletion fd.{bash,fish} 23 - installShellCompletion --zsh _fd) 24 ''; 25 26 meta = with lib; {
··· 18 preFixup = '' 19 installManPage "$src/doc/fd.1" 20 21 + installShellCompletion $releaseDir/build/fd-find-*/out/fd.{bash,fish} 22 + installShellCompletion --zsh $releaseDir/build/fd-find-*/out/_fd 23 ''; 24 25 meta = with lib; {
+1 -1
pkgs/tools/misc/lsd/default.nix
··· 19 20 nativeBuildInputs = [ installShellFiles ]; 21 postInstall = '' 22 - installShellCompletion target/release/build/lsd-*/out/{_lsd,lsd.{bash,fish}} 23 ''; 24 25 meta = with stdenv.lib; {
··· 19 20 nativeBuildInputs = [ installShellFiles ]; 21 postInstall = '' 22 + installShellCompletion $releaseDir/build/lsd-*/out/{_lsd,lsd.{bash,fish}} 23 ''; 24 25 meta = with stdenv.lib; {
+1 -1
pkgs/tools/networking/tox-node/default.nix
··· 24 installPhase = '' 25 runHook preInstall 26 27 - install -D target/release/tox-node $out/bin/tox-node 28 29 runHook postInstall 30 '';
··· 24 installPhase = '' 25 runHook preInstall 26 27 + install -D $releaseDir/tox-node $out/bin/tox-node 28 29 runHook postInstall 30 '';
+3 -3
pkgs/tools/text/ripgrep/default.nix
··· 30 ++ (stdenv.lib.optional stdenv.isDarwin Security); 31 32 preFixup = '' 33 - (cd target/release/build/ripgrep-*/out 34 - installManPage rg.1 35 - installShellCompletion rg.{bash,fish}) 36 installShellCompletion --zsh "$src/complete/_rg" 37 ''; 38
··· 30 ++ (stdenv.lib.optional stdenv.isDarwin Security); 31 32 preFixup = '' 33 + installManPage $releaseDir/build/ripgrep-*/out/rg.1 34 + 35 + installShellCompletion $releaseDir/build/ripgrep-*/out/rg.{bash,fish} 36 installShellCompletion --zsh "$src/complete/_rg" 37 ''; 38