diff options
| author | Craig Hall <ch9871@gmail.com> | 2019-06-24 01:42:48 +0100 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2019-11-24 18:32:26 +0000 |
| commit | da3c053482f374db4f7a44f2efac48044cbc7894 (patch) | |
| tree | 36d9a077ddac19630da2ce8bbea77d8bb6d6b133 /pkgs/build-support/bintools-wrapper | |
| parent | 04f3bc518e8fc12946e1a54aaa33c4e5d58519d3 (diff) | |
| download | nixlib-da3c053482f374db4f7a44f2efac48044cbc7894.tar nixlib-da3c053482f374db4f7a44f2efac48044cbc7894.tar.gz nixlib-da3c053482f374db4f7a44f2efac48044cbc7894.tar.bz2 nixlib-da3c053482f374db4f7a44f2efac48044cbc7894.tar.lz nixlib-da3c053482f374db4f7a44f2efac48044cbc7894.tar.xz nixlib-da3c053482f374db4f7a44f2efac48044cbc7894.tar.zst nixlib-da3c053482f374db4f7a44f2efac48044cbc7894.zip | |
{cc,bintools}-wrapper: Inherit compiler version
Diffstat (limited to 'pkgs/build-support/bintools-wrapper')
| -rw-r--r-- | pkgs/build-support/bintools-wrapper/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 5dddbde9eec2..b968411f221a 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -73,9 +73,9 @@ let in stdenv.mkDerivation { - name = targetPrefix - + (if name != "" then name else "${bintoolsName}-wrapper") - + (stdenv.lib.optionalString (bintools != null && bintoolsVersion != "") "-${bintoolsVersion}"); + pname = targetPrefix + + (if name != "" then name else "${bintoolsName}-wrapper"); + version = if bintools == null then null else bintoolsVersion; preferLocalBuild = true; |