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>

authored by R. RyanTM Renaud and committed by GitHub a1dfddfd 819401aa

+17 -4
+17 -4
pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix
··· 1 { lib, stdenv, fetchurl, jre, makeWrapper }: 2 3 stdenv.mkDerivation rec { 4 - version = "6.9.5"; 5 pname = "frostwire"; 6 7 src = fetchurl { 8 url = "https://dl.frostwire.com/frostwire/${version}/frostwire-${version}.amd64.tar.gz"; 9 - sha256 = "sha256-jMv4wIBsmgg2Q/Q/QDJnWa5wUeD1ur6Lu6eXOCLaGg4="; 10 }; 11 12 nativeBuildInputs = [ makeWrapper ]; 13 14 installPhase = '' 15 mkdir -p $out/share/java 16 mv $(ls */*.jar) $out/share/java 17 18 makeWrapper $out/share/java/frostwire $out/bin/frostwire \ 19 - --prefix PATH : ${jre}/bin/ 20 ''; 21 22 meta = with lib; { 23 homepage = "https://www.frostwire.com/"; 24 description = "BitTorrent Client and Cloud File Downloader"; 25 - license = licenses.gpl2; 26 maintainers = with maintainers; [ gavin ]; 27 platforms = [ "x86_64-linux"]; 28 };
··· 1 { lib, stdenv, fetchurl, jre, makeWrapper }: 2 3 stdenv.mkDerivation rec { 4 + version = "6.9.7"; 5 pname = "frostwire"; 6 7 src = fetchurl { 8 url = "https://dl.frostwire.com/frostwire/${version}/frostwire-${version}.amd64.tar.gz"; 9 + sha256 = "sha256-LsmDfNAj10x+txJ4PugyF3Irj/N1reb3ChTvFFIucdc="; 10 }; 11 12 nativeBuildInputs = [ makeWrapper ]; 13 14 installPhase = '' 15 + runHook preInstall 16 + 17 mkdir -p $out/share/java 18 mv $(ls */*.jar) $out/share/java 19 20 makeWrapper $out/share/java/frostwire $out/bin/frostwire \ 21 + --prefix PATH : ${jre}/bin \ 22 + --prefix LD_LIBRARY_PATH : $out/share/java \ 23 + --set JAVA_HOME "${jre}" 24 + 25 + substituteInPlace $out/share/java/frostwire \ 26 + --replace "export JAVA_PROGRAM_DIR=/usr/lib/frostwire/jre/bin" \ 27 + "export JAVA_PROGRAM_DIR=${jre}/bin/" 28 + 29 + substituteInPlace $out/share/java/frostwire.desktop \ 30 + --replace "Exec=/usr/bin/frostwire %U" "Exec=${placeholder "out"}/bin/frostwire %U" 31 + 32 + runHook postInstall 33 ''; 34 35 meta = with lib; { 36 homepage = "https://www.frostwire.com/"; 37 description = "BitTorrent Client and Cloud File Downloader"; 38 + license = licenses.gpl3Plus; 39 maintainers = with maintainers; [ gavin ]; 40 platforms = [ "x86_64-linux"]; 41 };