From 75f20c2e3e5ad81a996c33e8c5462263ac757e46 Mon Sep 17 00:00:00 2001 From: volth Date: Thu, 31 May 2018 21:33:15 +0000 Subject: [PATCH 1/3] frostwire: 6.6.3 -> 6.6.7 --- pkgs/applications/networking/p2p/frostwire/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/p2p/frostwire/default.nix b/pkgs/applications/networking/p2p/frostwire/default.nix index 727999414020..79d0e9acef92 100644 --- a/pkgs/applications/networking/p2p/frostwire/default.nix +++ b/pkgs/applications/networking/p2p/frostwire/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchFromGitHub, gradle, perl, jre, makeWrapper, makeDesktopItem, mplayer }: let - version = "6.6.3-build-253"; + version = "6.6.7-build-529"; name = "frostwire-desktop-${version}"; src = fetchFromGitHub { owner = "frostwire"; repo = "frostwire"; rev = name; - sha256 = "1bqv942hfz12i3b3nm1pfwdp7f58nzjxg44h31f3q47719hh8kd7"; + sha256 = "03wdj2kr8akzx8m1scvg98132zbaxh81qjdsxn2645b3gahjwz0m"; }; desktopItem = makeDesktopItem { @@ -40,7 +40,7 @@ let ''; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "0p279i41q7pn6nss8vndv3g4qzrvj3pmhdxq50kymwkyp2kly3lc"; + outputHash = "11zd98g0d0fdgls4lsskkagwfxyh26spfd6c6g9cahl89czvlg3c"; }; in stdenv.mkDerivation { From 2bd46c6b8029c7a3f3abff6c8b2336734f12bcc5 Mon Sep 17 00:00:00 2001 From: volth Date: Thu, 31 May 2018 21:34:21 +0000 Subject: [PATCH 2/3] frostwire-bin: 6.6.5 -> 6.6.7 --- pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix index 84ed1ff92591..d634502a0352 100644 --- a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix +++ b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix @@ -3,12 +3,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "6.6.5"; + version = "6.6.7"; name = "frostwire-${version}"; src = fetchurl { url = "http://dl.frostwire.com/frostwire/${version}/frostwire-${version}.noarch.tar.gz"; - sha256 = "0qxh5288mxd7ksd3zl0i8avkyzh8lj06x3jqya8znfq1c1wg0fph"; + sha256 = "01ah0cwr3ahihfz1xxs0irw4rsa7wjgnlkcqfyg5q9rmzwbnxkyh"; }; nativeBuildInputs = [ makeWrapper ]; From 8b984ba61e011b02466dc7f371a4d84ed81a713d Mon Sep 17 00:00:00 2001 From: volth Date: Thu, 31 May 2018 22:10:44 +0000 Subject: [PATCH 3/3] frostwire: disable auto-update --- .../applications/networking/p2p/frostwire/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/frostwire/default.nix b/pkgs/applications/networking/p2p/frostwire/default.nix index 79d0e9acef92..8cb5f768f956 100644 --- a/pkgs/applications/networking/p2p/frostwire/default.nix +++ b/pkgs/applications/networking/p2p/frostwire/default.nix @@ -52,8 +52,15 @@ in stdenv.mkDerivation { buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d) ( cd desktop + + # disable auto-update (anyway it won't update frostwire installed in nix store) + substituteInPlace src/com/frostwire/gui/updates/UpdateManager.java \ + --replace 'um.checkForUpdates' '// um.checkForUpdates' + + # fix path to mplayer substituteInPlace src/com/frostwire/gui/player/MediaPlayerLinux.java \ --replace /usr/bin/mplayer ${mplayer}/bin/mplayer + substituteInPlace build.gradle \ --replace 'mavenCentral()' 'mavenLocal(); maven { url uri("${deps}") }' gradle --offline --no-daemon build @@ -66,8 +73,8 @@ in stdenv.mkDerivation { cp desktop/build/libs/frostwire.jar $out/share/java/frostwire.jar cp ${ { x86_64-darwin = "desktop/lib/native/*.dylib"; - x86_64-linux = "desktop/lib/native/libjlibtorrent.so"; - i686-linux = "desktop/lib/native/libjlibtorrentx86.so"; + x86_64-linux = "desktop/lib/native/lib{jlibtorrent,SystemUtilities}.so"; + i686-linux = "desktop/lib/native/lib{jlibtorrent,SystemUtilities}X86.so"; }.${stdenv.system} or (throw "unsupported system ${stdenv.system}") } $out/lib