diff options
author | R. RyanTM <ryantm-bot@ryantm.com> | 2022-03-01 15:15:14 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-02 00:15:14 +0100 |
commit | a1dfddfdef9af7ab913b102d534077c3478407ba (patch) | |
tree | 0286cb99e3a7bb963d9ee6744c09b1d4e5218f3a /pkgs/applications/networking/p2p/frostwire | |
parent | 819401aaaff2f5182b0e48a49d0271f3b5e5a5e2 (diff) |
frostwire-bin: 6.9.5 -> 6.9.7
* frostwire-bin: 6.9.5 -> 6.9.7 (#161951) * frostwire-bin: properly use nixpkgs JRE and update meta.license according to https://www.frostwire.com/eula Co-authored-by: Renaud <c0bw3b@users.noreply.github.com>
Diffstat (limited to 'pkgs/applications/networking/p2p/frostwire')
-rw-r--r-- | pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix index 02c383b30ff71..cfee9d91c9308 100644 --- a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix +++ b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix @@ -1,28 +1,41 @@ { lib, stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - version = "6.9.5"; + version = "6.9.7"; pname = "frostwire"; src = fetchurl { url = "https://dl.frostwire.com/frostwire/${version}/frostwire-${version}.amd64.tar.gz"; - sha256 = "sha256-jMv4wIBsmgg2Q/Q/QDJnWa5wUeD1ur6Lu6eXOCLaGg4="; + sha256 = "sha256-LsmDfNAj10x+txJ4PugyF3Irj/N1reb3ChTvFFIucdc="; }; nativeBuildInputs = [ makeWrapper ]; installPhase = '' + runHook preInstall + mkdir -p $out/share/java mv $(ls */*.jar) $out/share/java makeWrapper $out/share/java/frostwire $out/bin/frostwire \ - --prefix PATH : ${jre}/bin/ + --prefix PATH : ${jre}/bin \ + --prefix LD_LIBRARY_PATH : $out/share/java \ + --set JAVA_HOME "${jre}" + + substituteInPlace $out/share/java/frostwire \ + --replace "export JAVA_PROGRAM_DIR=/usr/lib/frostwire/jre/bin" \ + "export JAVA_PROGRAM_DIR=${jre}/bin/" + + substituteInPlace $out/share/java/frostwire.desktop \ + --replace "Exec=/usr/bin/frostwire %U" "Exec=${placeholder "out"}/bin/frostwire %U" + + runHook postInstall ''; meta = with lib; { homepage = "https://www.frostwire.com/"; description = "BitTorrent Client and Cloud File Downloader"; - license = licenses.gpl2; + license = licenses.gpl3Plus; maintainers = with maintainers; [ gavin ]; platforms = [ "x86_64-linux"]; }; |