leiningen: Simplify build.

+23 -33
-23
pkgs/development/tools/build-managers/leiningen/builder.sh
··· 1 - #!/bin/bash 2 - 3 - source $stdenv/setup 4 - 5 - mkdir -pv $out/bin $out/share/java 6 - 7 - out_bin=$out/bin/lein 8 - 9 - cp -v $src $out_bin 10 - cp -v $jarsrc "$out/share/java/$name-standalone.jar" 11 - 12 - for p in $patches; 13 - do 14 - patch --verbose $out_bin -p0 < $p 15 - done 16 - chmod -v 755 $out_bin 17 - 18 - patchShebangs $out 19 - 20 - wrapProgram $out_bin \ 21 - --prefix PATH ":" "${stdenv.lib.makeBinPath [ rlwrap coreutils findutils ]}" \ 22 - --set LEIN_GPG ${gnupg1compat}/bin/gpg \ 23 - --set JAVA_CMD ${jdk}/bin/java
+23 -6
pkgs/development/tools/build-managers/leiningen/default.nix
··· 1 1 { stdenv, fetchurl, makeWrapper 2 - , coreutils, findutils, jdk, rlwrap, gnupg1compat }: 2 + , coreutils, jdk, rlwrap, gnupg1compat }: 3 3 4 4 stdenv.mkDerivation rec { 5 5 pname = "leiningen"; ··· 17 17 sha256 = "1533msarx6gb3xc2sp2nmspllnqy7anpnv9a0ifl0psxm3xph06p"; 18 18 }; 19 19 20 - patches = [ ./lein-fix-jar-path.patch ]; 20 + JARNAME = "${name}-standalone.jar"; 21 + 22 + unpackPhase = "true"; 23 + 24 + buildInputs = [ makeWrapper ]; 25 + propagatedBuildInputs = [ jdk ]; 26 + 27 + installPhase = '' 28 + mkdir -p $out/bin $out/share/java 21 29 22 - inherit rlwrap gnupg1compat findutils coreutils jdk; 30 + cp -v $src $out/bin/lein 31 + cp -v $jarsrc $out/share/java/$JARNAME 32 + ''; 23 33 24 - builder = ./builder.sh; 34 + fixupPhase = '' 35 + chmod +x $out/bin/lein 36 + patchShebangs $out/bin/lein 25 37 26 - buildInputs = [ makeWrapper ]; 38 + substituteInPlace $out/bin/lein \ 39 + --replace 'LEIN_JAR=/usr/share/java/leiningen-$LEIN_VERSION-standalone.jar' "LEIN_JAR=$out/share/java/$JARNAME" 27 40 28 - propagatedBuildInputs = [ jdk ]; 41 + wrapProgram $out/bin/lein \ 42 + --prefix PATH ":" "${stdenv.lib.makeBinPath [ rlwrap coreutils ]}" \ 43 + --set LEIN_GPG ${gnupg1compat}/bin/gpg \ 44 + --set JAVA_CMD ${jdk}/bin/java 45 + ''; 29 46 30 47 meta = { 31 48 homepage = http://leiningen.org/;
-4
pkgs/development/tools/build-managers/leiningen/lein-fix-jar-path.patch
··· 1 - 46c47 2 - < LEIN_JAR=/usr/share/java/leiningen-$LEIN_VERSION-standalone.jar 3 - --- 4 - > LEIN_JAR=$(find $(dirname $0)/../share/java -name *-standalone.jar | head -n 1)