Merge branch 'staging' into fix-ncurses-darwin-extensions

2018-05-02 15:40:38 -05:00
parent b4d9113fbf 3513034208
commit eeb016e8f0
251 changed files with 2068 additions and 1387 deletions
@@ -74,7 +74,7 @@ in

 stdenv.mkDerivation {
  name = targetPrefix
-    + (if name != "" then name else "${bintoolsName}-wrapper")
+    + (if name != "" then name else stdenv.lib.removePrefix targetPrefix "${bintoolsName}-wrapper")
    + (stdenv.lib.optionalString (bintools != null && bintoolsVersion != "") "-${bintoolsVersion}");

  preferLocalBuild = true;