diff --git a/pkgs/development/tools/build-managers/boot/builder.sh b/pkgs/development/tools/build-managers/boot/builder.sh index a6073308920..c1481dc6a14 100644 --- a/pkgs/development/tools/build-managers/boot/builder.sh +++ b/pkgs/development/tools/build-managers/boot/builder.sh @@ -8,6 +8,6 @@ chmod -v 755 $boot_bin patchShebangs $boot_bin -wrapProgram $boot_bin \ - --set JAVA_HOME "${jdk}" \ - --prefix PATH ":" "${jdk}/bin" +sed -i \ + -e "s;\${BOOT_JAVA_COMMAND:-java};\${BOOT_JAVA_COMMAND:-${jdk}/bin/java};g" \ + $boot_bin diff --git a/pkgs/development/tools/build-managers/boot/default.nix b/pkgs/development/tools/build-managers/boot/default.nix index cd5cf5d070a..6f9c2ce38a7 100644 --- a/pkgs/development/tools/build-managers/boot/default.nix +++ b/pkgs/development/tools/build-managers/boot/default.nix @@ -1,20 +1,18 @@ -{ stdenv, fetchurl, makeWrapper, jdk }: +{ stdenv, fetchurl, jdk }: stdenv.mkDerivation rec { - version = "2.4.2"; + version = "2.5.2"; name = "boot-${version}"; src = fetchurl { url = "https://github.com/boot-clj/boot-bin/releases/download/${version}/boot.sh"; - sha256 = "18d7dks6vvpwpw30jffzy7qqpypw6vhlp2sj838i5rj2q0imh14c"; + sha256 = "0brsimvmmpksxwc4l5c0x0cl5hhdjz76crd26yxphjvzyf7fypc9"; }; inherit jdk; builder = ./builder.sh; - buildInputs = [ makeWrapper ]; - propagatedBuildInputs = [ jdk ]; meta = {