Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e9ecd7f87256
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: da511852c153
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Dec 4, 2018

  1. leiningen: move leiningen-x.x-standalone.jar out of share/java 

    fixes #51448
    @bendlas
    bendlas committed Dec 4, 2018
    Copy the full SHA
    da51185 View commit details
Showing with 6 additions and 3 deletions.
  1. +6 −3 pkgs/development/tools/build-managers/leiningen/default.nix
9 changes: 6 additions & 3 deletions pkgs/development/tools/build-managers/leiningen/default.nix
View file
Original file line number Diff line number Diff line change
@@ -24,19 +24,22 @@ 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 = ''
chmod +x $out/bin/lein
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 ]}" \