diff options
| author | Wael M. Nasreddine <wael.nasreddine@gmail.com> | 2018-07-13 23:17:31 -0700 |
|---|---|---|
| committer | Wael M. Nasreddine <wael.nasreddine@gmail.com> | 2018-07-13 23:17:31 -0700 |
| commit | 137b4ffbb906cda0df2badac9375690b7f63e4f4 (patch) | |
| tree | 273f43b46d6d5fb015f5b00b09d63e44e216049c /pkgs/applications/networking | |
| parent | fdf7402e3a49d6b2097f881c50721df9588bd666 (diff) | |
| download | nixlib-137b4ffbb906cda0df2badac9375690b7f63e4f4.tar nixlib-137b4ffbb906cda0df2badac9375690b7f63e4f4.tar.gz nixlib-137b4ffbb906cda0df2badac9375690b7f63e4f4.tar.bz2 nixlib-137b4ffbb906cda0df2badac9375690b7f63e4f4.tar.lz nixlib-137b4ffbb906cda0df2badac9375690b7f63e4f4.tar.xz nixlib-137b4ffbb906cda0df2badac9375690b7f63e4f4.tar.zst nixlib-137b4ffbb906cda0df2badac9375690b7f63e4f4.zip | |
address volth comments
Diffstat (limited to 'pkgs/applications/networking')
| -rw-r--r-- | pkgs/applications/networking/charles/default.nix | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/pkgs/applications/networking/charles/default.nix b/pkgs/applications/networking/charles/default.nix index e18718025cf6..8cac15e78cba 100644 --- a/pkgs/applications/networking/charles/default.nix +++ b/pkgs/applications/networking/charles/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeDesktopItem, jre, hicolor-icon-theme }: +{ stdenv, fetchurl, makeDesktopItem, jre, makeWrapper }: let desktopItem = makeDesktopItem { @@ -21,19 +21,14 @@ in stdenv.mkDerivation rec { sha256 = "1hjfimyr9nnbbxadwni02d2xl64ybarh42l1g6hlslq5qwl8ywzb"; }; - installPhase = '' - mkdir -pv $out/bin - - cat > $out/bin/charles << EOF - #!${stdenv.shell} + buildInputs = [ makeWrapper ]; - ${jre}/bin/java -Xmx1024M -Dcharles.config="~/.charles.config" -Djava.library.path="$out/lib" -jar $out/lib/charles.jar $* - EOF - - chmod +x $out/bin/charles + installPhase = '' + makeWrapper ${jre}/bin/java $out/bin/charles \ + --add-flags "-Xmx1024M -Dcharles.config="~/.charles.config" -Djava.library.path="$out/lib" -jar $out/share/java/charles.jar" for fn in lib/*.jar; do - install -D -m644 $fn $out/$fn + install -D -m644 $fn $out/share/java/$(basename $fn) done mkdir -p $out/share/applications |