From ef1cb94d78735040308a32934382938b9280b5bb Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 10 Oct 2017 17:18:33 +0800 Subject: [PATCH] netalyzr: use makeWrapper i/o custom script --- pkgs/tools/networking/netalyzr/default.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/networking/netalyzr/default.nix b/pkgs/tools/networking/netalyzr/default.nix index abc6b785c9c..8f8cf929e9d 100644 --- a/pkgs/tools/networking/netalyzr/default.nix +++ b/pkgs/tools/networking/netalyzr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre }: +{ stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { name = "netalyzr-${version}"; @@ -12,17 +12,13 @@ stdenv.mkDerivation rec { phases = [ "installPhase" ]; + nativeBuildInputs = [ makeWrapper ]; + installPhase = '' mkdir -p $out/{bin,share/netalyzr} install -m644 $src $out/share/netalyzr/NetalyzrCLI.jar - cat <<_EOF >> $out/bin/netalyzr - #!${stdenv.shell} - - set -euo pipefail - - exec ${stdenv.lib.getBin jre}/bin/java -jar $out/share/netalyzr/NetalyzrCLI.jar "\$@" - _EOF - chmod 755 $out/bin/netalyzr + makeWrapper ${stdenv.lib.getBin jre}/bin/java $out/bin/netalyzr \ + --add-flags "-jar $out/share/netalyzr/NetalyzrCLI.jar" ''; meta = with stdenv.lib; {