From 5b7fd8f3b8602259ef0640db3d7b7ec1a7fe93eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 25 Jun 2017 07:46:51 +0100
Subject: [PATCH] nailgun: use makeWrapper

---
 pkgs/development/tools/nailgun/default.nix | 13 +++++--------
 1 file 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; {