diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2017-08-27 08:54:19 +0100 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2017-08-27 08:55:04 +0100 |
| commit | 9d74fd3e0730ca7e63016b2573950acb8402d372 (patch) | |
| tree | 852cc4918128941bf112c5a796a001019495d908 | |
| parent | 445465e2fc34825bf10dee510aa001b31b1361d5 (diff) | |
| download | nixlib-9d74fd3e0730ca7e63016b2573950acb8402d372.tar nixlib-9d74fd3e0730ca7e63016b2573950acb8402d372.tar.gz nixlib-9d74fd3e0730ca7e63016b2573950acb8402d372.tar.bz2 nixlib-9d74fd3e0730ca7e63016b2573950acb8402d372.tar.lz nixlib-9d74fd3e0730ca7e63016b2573950acb8402d372.tar.xz nixlib-9d74fd3e0730ca7e63016b2573950acb8402d372.tar.zst nixlib-9d74fd3e0730ca7e63016b2573950acb8402d372.zip | |
frostwire: add java to PATH
fixes #28547
| -rw-r--r-- | pkgs/applications/networking/p2p/frostwire/default.nix | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/pkgs/applications/networking/p2p/frostwire/default.nix b/pkgs/applications/networking/p2p/frostwire/default.nix index 74f0ef392efc..8a159f033aec 100644 --- a/pkgs/applications/networking/p2p/frostwire/default.nix +++ b/pkgs/applications/networking/p2p/frostwire/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre }: +{ stdenv, fetchurl, jre, makeWrapper }: with stdenv.lib; @@ -11,20 +11,14 @@ stdenv.mkDerivation rec { sha256 = "01nq1vwkqdidmprlnz5d3c5412r6igv689barv64dmb9m6iqg53z"; }; - inherit jre; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' - jar=$(ls */*.jar) - mkdir -p $out/share/java - mv $jar $out/share/java - - mkdir -p $out/bin - cat > $out/bin/frostwire <<EOF - #! $SHELL -e - exec $out/share/java/frostwire - EOF - chmod +x $out/bin/frostwire + mv $(ls */*.jar) $out/share/java + + makeWrapper $out/share/java/frostwire $out/bin/frostwire \ + --prefix PATH : ${jre}/bin/ ''; meta = with stdenv.lib; { |