Merge branch 'wrapper-pname-support-19.09' into wrapper-pname-support

This commit is contained in:
John Ericson 2019-11-24 18:00:29 +00:00
commit 747d5a3dbf

View File

@ -34,7 +34,7 @@ let
targetPrefix = stdenv.lib.optionalString (targetPlatform != hostPlatform)
(targetPlatform.config + "-");
bintoolsVersion = stdenv.lib.getVersion version;
bintoolsVersion = stdenv.lib.getVersion bintools;
bintoolsName = stdenv.lib.removePrefix targetPrefix (stdenv.lib.getName bintools);
libc_bin = if libc == null then null else getBin libc;