diff options
| author | Ragnar Dahlén <r.dahlen@gmail.com> | 2016-01-04 17:17:59 +0000 |
|---|---|---|
| committer | Ragnar Dahlén <r.dahlen@gmail.com> | 2016-01-04 17:23:45 +0000 |
| commit | a25bfab6903863feaecd7fede22576a68a369544 (patch) | |
| tree | e34c7a2742b97ae4c2698b5af730d47d447a16d3 /pkgs/development/tools/build-managers/boot | |
| parent | fde89b6762de859a738264750bd184205b9d18a5 (diff) | |
| download | nixlib-a25bfab6903863feaecd7fede22576a68a369544.tar nixlib-a25bfab6903863feaecd7fede22576a68a369544.tar.gz nixlib-a25bfab6903863feaecd7fede22576a68a369544.tar.bz2 nixlib-a25bfab6903863feaecd7fede22576a68a369544.tar.lz nixlib-a25bfab6903863feaecd7fede22576a68a369544.tar.xz nixlib-a25bfab6903863feaecd7fede22576a68a369544.tar.zst nixlib-a25bfab6903863feaecd7fede22576a68a369544.zip | |
boot: Update shell script version and remove makeWrapper usage
Diffstat (limited to 'pkgs/development/tools/build-managers/boot')
| -rw-r--r-- | pkgs/development/tools/build-managers/boot/builder.sh | 6 | ||||
| -rw-r--r-- | pkgs/development/tools/build-managers/boot/default.nix | 8 |
2 files changed, 6 insertions, 8 deletions
diff --git a/pkgs/development/tools/build-managers/boot/builder.sh b/pkgs/development/tools/build-managers/boot/builder.sh index a60733089204..c1481dc6a144 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 cd5cf5d070ae..6f9c2ce38a74 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 = { |