Merge master into staging-next

2019-08-31 09:50:38 +02:00
parent 98640fd482 81760f3235
commit fc74ba8291
364 changed files with 8989 additions and 6877 deletions
@@ -512,6 +512,8 @@ stdenv.mkDerivation rec {
    # The templates get tar’d up into a .jar,
    # so nix can’t detect python is needed in the runtime closure
    echo "${python3}" >> $out/nix-support/depends
+  '' + lib.optionalString stdenv.isDarwin ''
+    echo "${cctools}" >> $out/nix-support/depends
  '';

  dontStrip = true;