Merge staging-next into staging

2019-08-31 10:04:20 +02:00
parent ebe4fd146b fc74ba8291
commit ad1d58c622
364 changed files with 8970 additions and 6854 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;