diff options
author | Matthew Justin Bauer <mjbauer95@gmail.com> | 2018-05-02 15:40:38 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-02 15:40:38 -0500 |
commit | eeb016e8f0d8934dc33db7666d841e4b85713c9a (patch) | |
tree | 4a99561053ba51db60a75389e483784543b105ff /pkgs/build-support/bintools-wrapper/default.nix | |
parent | b4d9113fbf7ad3a09f5caa8f8fc4a9229128f1e5 (diff) | |
parent | 3513034208aac88004e4798020cb66540a77ddad (diff) | |
download | nixpkgs-eeb016e8f0d8934dc33db7666d841e4b85713c9a.tar nixpkgs-eeb016e8f0d8934dc33db7666d841e4b85713c9a.tar.gz nixpkgs-eeb016e8f0d8934dc33db7666d841e4b85713c9a.tar.bz2 nixpkgs-eeb016e8f0d8934dc33db7666d841e4b85713c9a.tar.lz nixpkgs-eeb016e8f0d8934dc33db7666d841e4b85713c9a.tar.xz nixpkgs-eeb016e8f0d8934dc33db7666d841e4b85713c9a.tar.zst nixpkgs-eeb016e8f0d8934dc33db7666d841e4b85713c9a.zip |
Merge branch 'staging' into fix-ncurses-darwin-extensions
Diffstat (limited to 'pkgs/build-support/bintools-wrapper/default.nix')
-rw-r--r-- | pkgs/build-support/bintools-wrapper/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 47301bbdde6..19e2902cb0d 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -74,7 +74,7 @@ in stdenv.mkDerivation { name = targetPrefix - + (if name != "" then name else "${bintoolsName}-wrapper") + + (if name != "" then name else stdenv.lib.removePrefix targetPrefix "${bintoolsName}-wrapper") + (stdenv.lib.optionalString (bintools != null && bintoolsVersion != "") "-${bintoolsVersion}"); preferLocalBuild = true; |