diff options
| author | John Ericson <git@JohnEricson.me> | 2019-11-24 18:35:13 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-24 18:35:13 -0500 |
| commit | 6d3b7458cc8b10c61b4c9024d5a24e2c0eb5ed85 (patch) | |
| tree | 20539c52c68c21abea4970aac8da7592f1c6fa77 /pkgs/build-support/cc-wrapper | |
| parent | 4f1261134ef3166910e57ec84e2fcc21279cf99d (diff) | |
| parent | ef328622e0dbcdd28f8a42481633ff8db5db8f10 (diff) | |
| download | nixpkgs-6d3b7458cc8b10c61b4c9024d5a24e2c0eb5ed85.tar nixpkgs-6d3b7458cc8b10c61b4c9024d5a24e2c0eb5ed85.tar.gz nixpkgs-6d3b7458cc8b10c61b4c9024d5a24e2c0eb5ed85.tar.bz2 nixpkgs-6d3b7458cc8b10c61b4c9024d5a24e2c0eb5ed85.tar.lz nixpkgs-6d3b7458cc8b10c61b4c9024d5a24e2c0eb5ed85.tar.xz nixpkgs-6d3b7458cc8b10c61b4c9024d5a24e2c0eb5ed85.tar.zst nixpkgs-6d3b7458cc8b10c61b4c9024d5a24e2c0eb5ed85.zip | |
Merge pull request #74065 from Ericson2314/cc-versions
compilers, binutils: Add version and pname
Diffstat (limited to 'pkgs/build-support/cc-wrapper')
| -rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index d02f47fde8c..2c35fdb1a3c 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -93,9 +93,9 @@ assert nativeLibc == bintools.nativeLibc; assert nativePrefix == bintools.nativePrefix; stdenv.mkDerivation { - name = targetPrefix - + (if name != "" then name else "${ccName}-wrapper") - + (stdenv.lib.optionalString (cc != null && ccVersion != "") "-${ccVersion}"); + pname = targetPrefix + + (if name != "" then name else "${ccName}-wrapper"); + version = if cc == null then null else ccVersion; preferLocalBuild = true; |