From 44164e9cd480e8d8fc3752e250c7965b3c265d36 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 26 Feb 2021 10:33:00 -0500 Subject: [PATCH] sbt: Remove installCheck The check is very fragile. We cannot replace it with different logic as that would require network access. ` --- pkgs/development/tools/build-managers/sbt/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index c9518d685b5..7ea10ac90ab 100644 --- 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; {