public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

{cc,bintools}-wrapper: Inherit compiler version

Browse Source
This commit is contained in:
Craig Hall 2019-06-24 01:42:48 +01:00 committed by John Ericson
parent 04f3bc518e
commit da3c053482
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/build-support/bintools-wrapper/default.nix
View File

@ -73,9 +73,9 @@ let
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = targetPrefix pname = targetPrefix
+ (if name != "" then name else "${bintoolsName}-wrapper") + (if name != "" then name else "${bintoolsName}-wrapper");
+ (stdenv.lib.optionalString (bintools != null && bintoolsVersion != "") "-${bintoolsVersion}"); version = if bintools == null then null else bintoolsVersion;
preferLocalBuild = true; preferLocalBuild = true;

6
pkgs/build-support/cc-wrapper/default.nix
View File

@ -93,9 +93,9 @@ assert nativeLibc == bintools.nativeLibc;
assert nativePrefix == bintools.nativePrefix; assert nativePrefix == bintools.nativePrefix;
stdenv.mkDerivation { stdenv.mkDerivation {
name = targetPrefix pname = targetPrefix
+ (if name != "" then name else "${ccName}-wrapper") + (if name != "" then name else "${ccName}-wrapper");
+ (stdenv.lib.optionalString (cc != null && ccVersion != "") "-${ccVersion}"); version = if cc == null then null else ccVersion;
preferLocalBuild = true; preferLocalBuild = true;