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
@@ -111,7 +111,8 @@ in
 assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == [];

 stdenv.mkDerivation ({
-  name = "${crossNameAddon}${name}${if stripped then "" else "-debug"}-${version}";
+  pname = "${crossNameAddon}${name}${if stripped then "" else "-debug"}";
+  inherit version;

  builder = ../builder.sh;