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/applications | |
| parent | 8e4e6fcf9dc9a1568cd83c33310bcc899c733a39 (diff) | |
| parent | 21b5e7d6f65dfbcd60570f5b7ee3624fa6f97e0a (diff) | |
| download | nixpkgs-ee58c7a36319f031b23c675a22cd9d9bffc5f5c2.tar nixpkgs-ee58c7a36319f031b23c675a22cd9d9bffc5f5c2.tar.gz nixpkgs-ee58c7a36319f031b23c675a22cd9d9bffc5f5c2.tar.bz2 nixpkgs-ee58c7a36319f031b23c675a22cd9d9bffc5f5c2.tar.lz nixpkgs-ee58c7a36319f031b23c675a22cd9d9bffc5f5c2.tar.xz nixpkgs-ee58c7a36319f031b23c675a22cd9d9bffc5f5c2.tar.zst nixpkgs-ee58c7a36319f031b23c675a22cd9d9bffc5f5c2.zip | |
Merge pull request #82982 from cole-h/rust-cleanup
improve robustness of various Rust packages
Diffstat (limited to 'pkgs/applications')
4 files changed, 6 insertions, 7 deletions
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/ ''; diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index c5d7b19618f..19f0790fea3 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 '' 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; { 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; { |