From da511852c153c8ca2395867dc60ac262bd603586 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Tue, 4 Dec 2018 02:57:28 +0100 Subject: [PATCH] leiningen: move leiningen-x.x-standalone.jar out of share/java fixes #51448 --- .../tools/build-managers/leiningen/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix index 30531c980b0b..4faf524af117 100644 --- a/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/pkgs/development/tools/build-managers/leiningen/default.nix @@ -24,11 +24,14 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper ]; propagatedBuildInputs = [ jdk ]; + # the jar is not in share/java, because it's a standalone jar and should + # never be picked up by set-java-classpath.sh + installPhase = '' - mkdir -p $out/bin $out/share/java + mkdir -p $out/bin $out/share cp -v $src $out/bin/lein - cp -v $jarsrc $out/share/java/$JARNAME + cp -v $jarsrc $out/share/$JARNAME ''; fixupPhase = '' @@ -36,7 +39,7 @@ stdenv.mkDerivation rec { patchShebangs $out/bin/lein substituteInPlace $out/bin/lein \ - --replace 'LEIN_JAR=/usr/share/java/leiningen-$LEIN_VERSION-standalone.jar' "LEIN_JAR=$out/share/java/$JARNAME" + --replace 'LEIN_JAR=/usr/share/java/leiningen-$LEIN_VERSION-standalone.jar' "LEIN_JAR=$out/share/$JARNAME" wrapProgram $out/bin/lein \ --prefix PATH ":" "${stdenv.lib.makeBinPath [ rlwrap coreutils ]}" \