summary refs log tree commit diff
diff options
context:
space:
mode:
authorChristopher League <league@contrapunctus.net>2019-05-21 14:33:00 -0400
committerFrederik Rietdijk <freddyrietdijk@fridh.nl>2019-05-24 20:43:21 +0200
commit53b7e136e5d12729d7258f18f88a10f4c5d0369d (patch)
tree46c844c9f181875b01234039b232ed5b5573a53a
parent0b0265a9328a9d684b5d35adbdddb440cbe5bac4 (diff)
downloadnixpkgs-53b7e136e5d12729d7258f18f88a10f4c5d0369d.tar
nixpkgs-53b7e136e5d12729d7258f18f88a10f4c5d0369d.tar.gz
nixpkgs-53b7e136e5d12729d7258f18f88a10f4c5d0369d.tar.bz2
nixpkgs-53b7e136e5d12729d7258f18f88a10f4c5d0369d.tar.lz
nixpkgs-53b7e136e5d12729d7258f18f88a10f4c5d0369d.tar.xz
nixpkgs-53b7e136e5d12729d7258f18f88a10f4c5d0369d.tar.zst
nixpkgs-53b7e136e5d12729d7258f18f88a10f4c5d0369d.zip
briss: Use makeWrapper so it can take command-line args
-rw-r--r--pkgs/tools/graphics/briss/default.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/tools/graphics/briss/default.nix b/pkgs/tools/graphics/briss/default.nix
index a6b3ba01bfa..57a6c8c9673 100644
--- a/pkgs/tools/graphics/briss/default.nix
+++ b/pkgs/tools/graphics/briss/default.nix
@@ -1,6 +1,6 @@
 # The releases of this project are apparently precompiled to .jar files.
 
-{ stdenv, fetchurl, jre, runtimeShell }:
+{ stdenv, fetchurl, jre, makeWrapper }:
 
 let
 
@@ -14,13 +14,13 @@ in stdenv.mkDerivation {
     inherit sha256;
   };
 
+  nativeBuildInputs = [makeWrapper];
+
   installPhase = ''
     mkdir -p "$out/bin";
     mkdir -p "$out/share";
     install -D -m444 -t "$out/share" *.jar
-    echo "#!${runtimeShell}" > "$out/bin/briss"
-    echo "${jre}/bin/java -Xms128m -Xmx1024m -cp \"$out/share/\" -jar \"$out/share/briss-${version}.jar\"" >> "$out/bin/briss"
-    chmod +x "$out/bin/briss"
+    makeWrapper "${jre}/bin/java" "$out/bin/briss" --add-flags "-Xms128m -Xmx1024m -cp \"$out/share/\" -jar \"$out/share/briss-${version}.jar\""
   '';
 
   meta = {