mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 21:50:55 +00:00
Code Issues Wiki Activity

Merge pull request #12148 from ragnard/boot-update-and-remove-make-wrapper-usage

Browse source 
boot: Update shell script version and remove makeWrapper usage
This commit is contained in:
Peter Simons 2016-01-05 12:22:23 +01:00
parent 24e0868763 a25bfab690
commit 1355e928cf
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/tools/build-managers/boot/builder.sh
View file

@ -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

8
pkgs/development/tools/build-managers/boot/default.nix
View file

@ -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 = {