commit 02b77eaf4a6ff64adc5b1dc664dfadbcaaf8a664 · pyrox.dev/nixpkgs

+12 -5

pkgs/applications/networking/p2p/frostwire/default.nix

···

       1
       1
        
       { stdenv, lib, fetchFromGitHub, gradle, perl, jre, makeWrapper, makeDesktopItem, mplayer }:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
       -
         version = "6.6.3-build-253";

     

       4
       4
       +
         version = "6.6.7-build-529";

     

       5
       5
        
         name = "frostwire-desktop-${version}";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "frostwire";

     

       9
       9
        
           repo = "frostwire";

     

       10
       10
        
           rev = name;

     

       11
       11
       -
           sha256 = "1bqv942hfz12i3b3nm1pfwdp7f58nzjxg44h31f3q47719hh8kd7";

     

       11
       11
       +
           sha256 = "03wdj2kr8akzx8m1scvg98132zbaxh81qjdsxn2645b3gahjwz0m";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         desktopItem = makeDesktopItem {

     
···

       40
       40
        
           '';

     

       41
       41
        
           outputHashAlgo = "sha256";

     

       42
       42
        
           outputHashMode = "recursive";

     

       43
       43
       -
           outputHash = "0p279i41q7pn6nss8vndv3g4qzrvj3pmhdxq50kymwkyp2kly3lc";

     

       43
       43
       +
           outputHash = "11zd98g0d0fdgls4lsskkagwfxyh26spfd6c6g9cahl89czvlg3c";

     

       44
       44
        
         };

     

       45
       45
        
       

     

       46
       46
        
       in stdenv.mkDerivation {

     
···

       52
       52
        
         buildPhase = ''

     

       53
       53
        
           export GRADLE_USER_HOME=$(mktemp -d)

     

       54
       54
        
           ( cd desktop

     

       55
       55
       +
       

     

       56
       56
       +
             # disable auto-update (anyway it won't update frostwire installed in nix store)

     

       57
       57
       +
             substituteInPlace src/com/frostwire/gui/updates/UpdateManager.java \

     

       58
       58
       +
               --replace 'um.checkForUpdates' '// um.checkForUpdates'

     

       59
       59
       +
       

     

       60
       60
       +
             # fix path to mplayer

     

       55
       61
        
             substituteInPlace src/com/frostwire/gui/player/MediaPlayerLinux.java \

     

       56
       62
        
               --replace /usr/bin/mplayer ${mplayer}/bin/mplayer

     

       63
       63
       +
       

     

       57
       64
        
             substituteInPlace build.gradle \

     

       58
       65
        
               --replace 'mavenCentral()' 'mavenLocal(); maven { url uri("${deps}") }'

     

       59
       66
        
             gradle --offline --no-daemon build

     
···

       66
       73
        
           cp desktop/build/libs/frostwire.jar $out/share/java/frostwire.jar

     

       67
       74
        
       

     

       68
       75
        
           cp ${ { x86_64-darwin = "desktop/lib/native/*.dylib";

     

       69
       69
       -
                   x86_64-linux  = "desktop/lib/native/libjlibtorrent.so";

     

       70
       70
       -
                   i686-linux    = "desktop/lib/native/libjlibtorrentx86.so";

     

       76
       76
       +
                   x86_64-linux  = "desktop/lib/native/lib{jlibtorrent,SystemUtilities}.so";

     

       77
       77
       +
                   i686-linux    = "desktop/lib/native/lib{jlibtorrent,SystemUtilities}X86.so";

     

       71
       78
        
                 }.${stdenv.system} or (throw "unsupported system ${stdenv.system}")

     

       72
       79
        
               } $out/lib

     

       73
       80

+2 -2

pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix

···

       3
       3
        
       with stdenv.lib;

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
       -
         version = "6.6.5";

     

       6
       6
       +
         version = "6.6.7";

     

       7
       7
        
         name = "frostwire-${version}";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchurl {

     

       10
       10
        
           url = "http://dl.frostwire.com/frostwire/${version}/frostwire-${version}.noarch.tar.gz";

     

       11
       11
       -
           sha256 = "0qxh5288mxd7ksd3zl0i8avkyzh8lj06x3jqya8znfq1c1wg0fph";

     

       11
       11
       +
           sha256 = "01ah0cwr3ahihfz1xxs0irw4rsa7wjgnlkcqfyg5q9rmzwbnxkyh";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ makeWrapper ];