diff options
author | Craig Hall <ch9871@gmail.com> | 2019-08-14 14:52:15 +0100 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2019-11-24 16:33:21 +0000 |
commit | 99537e994f09e8e5499d3d877df0e16da8452ca7 (patch) | |
tree | cb4dce5c67a9bf437fbdab474d8795363eae5f3c /pkgs/build-support/cc-wrapper | |
parent | 84a105254d52d8ded6c5365399b61bea14505cd7 (diff) | |
download | nixlib-99537e994f09e8e5499d3d877df0e16da8452ca7.tar nixlib-99537e994f09e8e5499d3d877df0e16da8452ca7.tar.gz nixlib-99537e994f09e8e5499d3d877df0e16da8452ca7.tar.bz2 nixlib-99537e994f09e8e5499d3d877df0e16da8452ca7.tar.lz nixlib-99537e994f09e8e5499d3d877df0e16da8452ca7.tar.xz nixlib-99537e994f09e8e5499d3d877df0e16da8452ca7.tar.zst nixlib-99537e994f09e8e5499d3d877df0e16da8452ca7.zip |
{cc,bintools}-wrapper: use cc pname/version if set
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 cf2d38cd9978..9851602179cb 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -35,8 +35,8 @@ let targetPrefix = stdenv.lib.optionalString (targetPlatform != hostPlatform) (targetPlatform.config + "-"); - ccVersion = (builtins.parseDrvName cc.name).version; - ccName = (builtins.parseDrvName cc.name).name; + ccVersion = stdenv.lib.getVersion cc; + ccName = stdenv.lib.removePrefix targetPrefix (stdenv.lib.getName cc); libc_bin = if libc == null then null else getBin libc; libc_dev = if libc == null then null else getDev libc; @@ -94,7 +94,7 @@ assert nativePrefix == bintools.nativePrefix; stdenv.mkDerivation { name = targetPrefix - + (if name != "" then name else stdenv.lib.removePrefix targetPrefix "${ccName}-wrapper") + + (if name != "" then name else "${ccName}-wrapper") + (stdenv.lib.optionalString (cc != null && ccVersion != "") "-${ccVersion}"); preferLocalBuild = true; |