diff options
| author | John Ericson <Ericson2314@yahoo.com> | 2018-04-26 11:41:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-26 11:41:18 -0400 |
| commit | 591d8c7a195f7874bf3b8e248a6e4d8b956e747c (patch) | |
| tree | 8d258a604f20c62bccf4e2ae0d30fff98cf923e5 /pkgs/build-support | |
| parent | 5e1603f1fde4c2b77ec3f1c560fde30c735efb81 (diff) | |
| parent | 43dbc268cbe74b68e504a0a03087514cbd2f2cdf (diff) | |
| download | nixlib-591d8c7a195f7874bf3b8e248a6e4d8b956e747c.tar nixlib-591d8c7a195f7874bf3b8e248a6e4d8b956e747c.tar.gz nixlib-591d8c7a195f7874bf3b8e248a6e4d8b956e747c.tar.bz2 nixlib-591d8c7a195f7874bf3b8e248a6e4d8b956e747c.tar.lz nixlib-591d8c7a195f7874bf3b8e248a6e4d8b956e747c.tar.xz nixlib-591d8c7a195f7874bf3b8e248a6e4d8b956e747c.tar.zst nixlib-591d8c7a195f7874bf3b8e248a6e4d8b956e747c.zip | |
Merge pull request #39458 from oxij/stdenv/beautifications
stdenv: better names for cc and bintools
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/bintools-wrapper/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 5c0436b73ddf..a4e2ecb63b81 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; diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 43cd87fb4597..700e7547b7ae 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -71,7 +71,7 @@ assert nativePrefix == bintools.nativePrefix; stdenv.mkDerivation { name = targetPrefix - + (if name != "" then name else "${ccName}-wrapper") + + (if name != "" then name else stdenv.lib.removePrefix targetPrefix "${ccName}-wrapper") + (stdenv.lib.optionalString (cc != null && ccVersion != "") "-${ccVersion}"); preferLocalBuild = true; |