Merge master into staging-next

2020-10-13 19:34:34 +02:00
parent aabcf2d8f5 c5a41da563
commit 9e1943edc0
210 changed files with 11913 additions and 8961 deletions
@@ -14,9 +14,9 @@ stdenv.mkDerivation rec {
    echo -java-home ${jre.home} >>conf/sbtopts
  '';

-  nativeBuildInputs = [ autoPatchelfHook ];
+  nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ autoPatchelfHook ];

-  buildInputs = [ zlib ];
+  buildInputs = stdenv.lib.optionals stdenv.isLinux [ zlib ];

  installPhase = ''
    mkdir -p $out/share/sbt $out/bin