mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-12 03:56:17 +03:00
Merge pull request #12148 from ragnard/boot-update-and-remove-make-wrapper-usage
boot: Update shell script version and remove makeWrapper usage
This commit is contained in:
commit
1355e928cf
@ -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
|
||||
|
@ -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 = {
|
||||
|
Loading…
Reference in New Issue
Block a user