Merge pull request #74065 from Ericson2314/cc-versions

compilers, binutils: Add version and pname
2019-11-24 18:35:13 -05:00
parent 4f1261134e ef328622e0
commit 6d3b7458cc
23 changed files with 60 additions and 40 deletions
@@ -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;