diff options
| author | Christopher League <league@contrapunctus.net> | 2017-02-22 08:13:01 -0500 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2017-02-26 10:19:32 +0100 |
| commit | 242f6caac6e4033d0ff2827d87da807a629bc7b4 (patch) | |
| tree | 6b46ccc70c39f6cbb60a354668488160aa9868ea /pkgs/applications/science/logic/logisim | |
| parent | d444aa4ade58fc4196dbcaba25e134f11736c514 (diff) | |
| download | nixpkgs-242f6caac6e4033d0ff2827d87da807a629bc7b4.tar nixpkgs-242f6caac6e4033d0ff2827d87da807a629bc7b4.tar.gz nixpkgs-242f6caac6e4033d0ff2827d87da807a629bc7b4.tar.bz2 nixpkgs-242f6caac6e4033d0ff2827d87da807a629bc7b4.tar.lz nixpkgs-242f6caac6e4033d0ff2827d87da807a629bc7b4.tar.xz nixpkgs-242f6caac6e4033d0ff2827d87da807a629bc7b4.tar.zst nixpkgs-242f6caac6e4033d0ff2827d87da807a629bc7b4.zip | |
logisim: use better jar wrapper, closes #23068
Diffstat (limited to 'pkgs/applications/science/logic/logisim')
| -rw-r--r-- | pkgs/applications/science/logic/logisim/default.nix | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/pkgs/applications/science/logic/logisim/default.nix b/pkgs/applications/science/logic/logisim/default.nix index 27c8947b8cc..50ef1edf63e 100644 --- a/pkgs/applications/science/logic/logisim/default.nix +++ b/pkgs/applications/science/logic/logisim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre }: +{ stdenv, fetchurl, jre, makeWrapper }: let version = "2.7.1"; in @@ -11,17 +11,12 @@ stdenv.mkDerivation { }; phases = [ "installPhase" ]; - + + nativeBuildInputs = [makeWrapper]; + installPhase = '' mkdir -pv $out/bin - cp -v $src $out/logisim.jar - - cat > $out/bin/logisim << EOF - #!${stdenv.shell} - ${jre}/bin/java -jar $out/logisim.jar - EOF - - chmod +x $out/bin/logisim + makeWrapper ${jre}/bin/java $out/bin/logisim --add-flags "-jar $src" ''; meta = { |