Merge remote-tracking branch 'upstream/staging' into binutils-wrapper

2017-12-13 16:14:47 -05:00
parent 84fb59e0be 105d9519c1
commit a0b1ebeee9
803 changed files with 17167 additions and 12293 deletions
@@ -37,6 +37,8 @@ in
    inherit (darwin) opencflite;
  };

+  insert_dylib = callPackage ../os-specific/darwin/insert_dylib { };
+
  ios-cross = callPackage ../os-specific/darwin/ios-cross {
    inherit (darwin) binutils;
  };