From fb3b3d6394c1220586717793096236b1b783fd68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 5 Apr 2018 19:21:16 +0100 Subject: [PATCH] weka: use makeWrapper --- pkgs/applications/science/math/weka/default.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/science/math/weka/default.nix b/pkgs/applications/science/math/weka/default.nix index a59746dcaeb..3bfb22dad93 100644 --- a/pkgs/applications/science/math/weka/default.nix +++ b/pkgs/applications/science/math/weka/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, unzip }: +{ stdenv, fetchurl, jre, unzip, makeWrapper }: stdenv.mkDerivation rec { name = "weka-${version}"; @@ -9,20 +9,16 @@ stdenv.mkDerivation rec { sha256 = "0zwmhspmqb0a7cm6k6i0s6q3w19ws1g9dx3cp2v3g3vsif6cdh31"; }; - buildInputs = [ unzip ]; + buildInputs = [ unzip makeWrapper ]; # The -Xmx1000M comes suggested from their download page: # http://www.cs.waikato.ac.nz/ml/weka/downloading.html installPhase = '' - mkdir -pv $out/share/weka $out/bin + mkdir -pv $out/share/weka cp -Rv * $out/share/weka - cat > $out/bin/weka << EOF - #!${stdenv.shell} - ${jre}/bin/java -Xmx1000M -jar $out/share/weka/weka.jar - EOF - - chmod +x $out/bin/weka + makeWrapper ${jre}/bin/java $out/bin/weka \ + --add-flags "-Xmx1000M -jar $out/share/weka/weka.jar" ''; meta = {