Merge branch 'master' into unused5

2018-07-21 15:41:22 +01:00
parent cd6e2c9642 e85db6863a
commit 218298b30f
203 changed files with 1655 additions and 627 deletions
@@ -6,8 +6,7 @@
 }:

 let
-  inherit (stdenv.lib) getLib optionalString;
-  inherit (darwin) libiconv;
+  inherit (stdenv.lib) optionalString;
  inherit (darwin.apple_sdk.frameworks) Security;

  bootstrapping = versionType == "bootstrap";
@@ -13,7 +13,7 @@
 , doCheck ? true
 , broken ? false
 , buildPlatform, hostPlatform
-} @ args:
+}:

 let
  inherit (stdenv.lib) optional optionalString;