Merge pull request #114474 from NeQuissimus/sbt_jdk11

sbt: Fix check
NixOS · Mar 3, 2021 · e061350 · e061350
2 parents d774b42 + 44164e9
commit e061350
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-wqdZ/kCjwhoWtaiNAM1m869vByHk6mG2OULfuDotVP0=";
   };
 
-  patchPhase = ''
+  postPatch = ''
     echo -java-home ${jre.home} >>conf/sbtopts
   '';
 
@@ -25,17 +25,16 @@ stdenv.mkDerivation rec {
   buildInputs = lib.optionals stdenv.isLinux [ zlib ];
 
   installPhase = ''
+    runHook preInstall
+
     mkdir -p $out/share/sbt $out/bin
     cp -ra . $out/share/sbt
     ln -sT ../share/sbt/bin/sbt $out/bin/sbt
     ln -sT ../share/sbt/bin/sbtn-x86_64-${
       if (stdenv.isDarwin) then "apple-darwin" else "pc-linux"
     } $out/bin/sbtn
-  '';
 
-  doInstallCheck = true;
-  installCheckPhase = ''
-    ($out/bin/sbt --offline --version 2>&1 || true) | grep 'getting org.scala-sbt sbt ${version}  (this may take some time)'
+    runHook postInstall
   '';
 
   meta = with lib; {