diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2017-06-25 07:46:51 +0100 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2017-06-25 07:46:51 +0100 |
| commit | 5b7fd8f3b8602259ef0640db3d7b7ec1a7fe93eb (patch) | |
| tree | b5e0c3a11ec40dec407f71158c467f30320d70b3 | |
| parent | 649a036dccfd2f23179582c3b995046833bd0b26 (diff) | |
| download | nixlib-5b7fd8f3b8602259ef0640db3d7b7ec1a7fe93eb.tar nixlib-5b7fd8f3b8602259ef0640db3d7b7ec1a7fe93eb.tar.gz nixlib-5b7fd8f3b8602259ef0640db3d7b7ec1a7fe93eb.tar.bz2 nixlib-5b7fd8f3b8602259ef0640db3d7b7ec1a7fe93eb.tar.lz nixlib-5b7fd8f3b8602259ef0640db3d7b7ec1a7fe93eb.tar.xz nixlib-5b7fd8f3b8602259ef0640db3d7b7ec1a7fe93eb.tar.zst nixlib-5b7fd8f3b8602259ef0640db3d7b7ec1a7fe93eb.zip | |
nailgun: use makeWrapper
| -rw-r--r-- | pkgs/development/tools/nailgun/default.nix | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/pkgs/development/tools/nailgun/default.nix b/pkgs/development/tools/nailgun/default.nix index ec19606eea9d..aef851e64765 100644 --- a/pkgs/development/tools/nailgun/default.nix +++ b/pkgs/development/tools/nailgun/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchMavenArtifact, fetchFromGitHub, bash, jre }: +{ stdenv, fetchMavenArtifact, fetchFromGitHub, bash, jre, makeWrapper }: let version = "0.9.1"; @@ -21,16 +21,13 @@ stdenv.mkDerivation rec { makeFlags = "PREFIX=$(out)"; + buildInputs = [ makeWrapper ]; + installPhase = '' install -D ng $out/bin/ng - install -D ${nailgun-server.jar} $out/share/java/nailgun-server-${version}.jar - - cat > $out/bin/ng-server << EOF - #!${bash}/bin/bash - ${jre}/bin/java -cp $out/share/java/nailgun-server-${version}.jar:\$CLASSPATH com.martiansoftware.nailgun.NGServer "\$@" - EOF - chmod +x $out/bin/ng-server + makeWrapper ${jre}/bin/java $out/bin/ng-server \ + --add-flags '-cp ${nailgun-server.jar}:$CLASSPATH com.martiansoftware.nailgun.NGServer' ''; meta = with stdenv.lib; { |