public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #41336 from volth/patch-129

Browse Source 
frostwire: 6.6.3 -> 6.6.7
This commit is contained in:
xeji 2018-06-01 02:10:57 +02:00 committed by GitHub
commit 02b77eaf4a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/applications/networking/p2p/frostwire/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, lib, fetchFromGitHub, gradle, perl, jre, makeWrapper, makeDesktopItem, mplayer }: { stdenv, lib, fetchFromGitHub, gradle, perl, jre, makeWrapper, makeDesktopItem, mplayer }:
let let
version = "6.6.3-build-253"; version = "6.6.7-build-529";
name = "frostwire-desktop-${version}"; name = "frostwire-desktop-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "frostwire"; owner = "frostwire";
repo = "frostwire"; repo = "frostwire";
rev = name; rev = name;
sha256 = "1bqv942hfz12i3b3nm1pfwdp7f58nzjxg44h31f3q47719hh8kd7"; sha256 = "03wdj2kr8akzx8m1scvg98132zbaxh81qjdsxn2645b3gahjwz0m";
}; };
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
@ -40,7 +40,7 @@ let
''; '';
outputHashAlgo = "sha256"; outputHashAlgo = "sha256";
outputHashMode = "recursive"; outputHashMode = "recursive";
outputHash = "0p279i41q7pn6nss8vndv3g4qzrvj3pmhdxq50kymwkyp2kly3lc"; outputHash = "11zd98g0d0fdgls4lsskkagwfxyh26spfd6c6g9cahl89czvlg3c";
}; };
in stdenv.mkDerivation { in stdenv.mkDerivation {
@ -52,8 +52,15 @@ in stdenv.mkDerivation {
buildPhase = '' buildPhase = ''
export GRADLE_USER_HOME=$(mktemp -d) export GRADLE_USER_HOME=$(mktemp -d)
( cd desktop ( 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 \ substituteInPlace src/com/frostwire/gui/player/MediaPlayerLinux.java \
--replace /usr/bin/mplayer ${mplayer}/bin/mplayer --replace /usr/bin/mplayer ${mplayer}/bin/mplayer
substituteInPlace build.gradle \ substituteInPlace build.gradle \
--replace 'mavenCentral()' 'mavenLocal(); maven { url uri("${deps}") }' --replace 'mavenCentral()' 'mavenLocal(); maven { url uri("${deps}") }'
gradle --offline --no-daemon build gradle --offline --no-daemon build
@ -66,8 +73,8 @@ in stdenv.mkDerivation {
cp desktop/build/libs/frostwire.jar $out/share/java/frostwire.jar cp desktop/build/libs/frostwire.jar $out/share/java/frostwire.jar
cp ${ { x86_64-darwin = "desktop/lib/native/*.dylib"; cp ${ { x86_64-darwin = "desktop/lib/native/*.dylib";
x86_64-linux = "desktop/lib/native/libjlibtorrent.so"; x86_64-linux = "desktop/lib/native/lib{jlibtorrent,SystemUtilities}.so";
i686-linux = "desktop/lib/native/libjlibtorrentx86.so"; i686-linux = "desktop/lib/native/lib{jlibtorrent,SystemUtilities}X86.so";
}.${stdenv.system} or (throw "unsupported system ${stdenv.system}") }.${stdenv.system} or (throw "unsupported system ${stdenv.system}")
} $out/lib } $out/lib

4
pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix
View File

@ -3,12 +3,12 @@
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "6.6.5"; version = "6.6.7";
name = "frostwire-${version}"; name = "frostwire-${version}";
src = fetchurl { src = fetchurl {
url = "http://dl.frostwire.com/frostwire/${version}/frostwire-${version}.noarch.tar.gz"; url = "http://dl.frostwire.com/frostwire/${version}/frostwire-${version}.noarch.tar.gz";
sha256 = "0qxh5288mxd7ksd3zl0i8avkyzh8lj06x3jqya8znfq1c1wg0fph"; sha256 = "01ah0cwr3ahihfz1xxs0irw4rsa7wjgnlkcqfyg5q9rmzwbnxkyh";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];