diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-01-19 09:55:31 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-01-19 09:55:31 +0100 |
commit | 716aac2519a7571e7f5fd984a886d579a4a051c5 (patch) | |
tree | 53cf89cf764d787f4dc8f08474479892b9733177 /pkgs/applications/networking/p2p | |
parent | f8472457a440de3c44f6f604142d678b6ae2a762 (diff) | |
parent | 53b389327e34de319dc0dbda2b6bcab1a69db69d (diff) | |
download | nixlib-716aac2519a7571e7f5fd984a886d579a4a051c5.tar nixlib-716aac2519a7571e7f5fd984a886d579a4a051c5.tar.gz nixlib-716aac2519a7571e7f5fd984a886d579a4a051c5.tar.bz2 nixlib-716aac2519a7571e7f5fd984a886d579a4a051c5.tar.lz nixlib-716aac2519a7571e7f5fd984a886d579a4a051c5.tar.xz nixlib-716aac2519a7571e7f5fd984a886d579a4a051c5.tar.zst nixlib-716aac2519a7571e7f5fd984a886d579a4a051c5.zip |
Merge branch 'staging' into closure-size
Diffstat (limited to 'pkgs/applications/networking/p2p')
4 files changed, 67 insertions, 39 deletions
diff --git a/pkgs/applications/networking/p2p/freenet/default.nix b/pkgs/applications/networking/p2p/freenet/default.nix index 80f8eb840f13..51d7a49cac79 100644 --- a/pkgs/applications/networking/p2p/freenet/default.nix +++ b/pkgs/applications/networking/p2p/freenet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchgit, ant, jdk, makeWrapper }: +{ stdenv, fetchurl, fetchgit, ant, jdk, bash, coreutils, substituteAll }: let freenet_ext = fetchurl { @@ -15,46 +15,56 @@ let sha256 = "109zn9w8axdkjwhkkcm2s8dvib0mq0n8imjgs3r8hvi128cjsmg9"; }; version = "build01470"; -in -stdenv.mkDerivation { - name = "freenet-${version}"; + freenet-jars = stdenv.mkDerivation { + name = "freenet-jars-${version}"; - src = fetchgit { - url = https://github.com/freenet/fred; - rev = "refs/tags/${version}"; - sha256 = "1b6e6fec2b9a729d4a25605fa142df9ea42e59b379ff665f580e32c6178c9746"; - }; + src = fetchgit { + url = https://github.com/freenet/fred; + rev = "refs/tags/${version}"; + sha256 = "1b6e6fec2b9a729d4a25605fa142df9ea42e59b379ff665f580e32c6178c9746"; + }; - patchPhase = '' - cp ${freenet_ext} lib/freenet/freenet-ext.jar - cp ${bcprov} lib/bcprov-jdk15on-152.jar + patchPhase = '' + cp ${freenet_ext} lib/freenet/freenet-ext.jar + cp ${bcprov} lib/bcprov-jdk15on-152.jar - sed '/antcall.*-ext/d' -i build.xml - sed 's/@unknown@/${version}/g' -i build-clean.xml - ''; + sed '/antcall.*-ext/d' -i build.xml + sed 's/@unknown@/${version}/g' -i build-clean.xml + ''; - buildInputs = [ ant jdk makeWrapper ]; + buildInputs = [ ant jdk ]; - buildPhase = "ant package-only"; + buildPhase = "ant package-only"; - freenetWrapper = ./freenetWrapper; + installPhase = '' + mkdir -p $out/share/freenet + cp lib/bcprov-jdk15on-152.jar $out/share/freenet + cp lib/freenet/freenet-ext.jar $out/share/freenet + cp dist/freenet.jar $out/share/freenet + ''; + }; - installPhase = '' - mkdir -p $out/share/freenet $out/bin - cp lib/bcprov-jdk15on-152.jar $out/share/freenet - cp lib/freenet/freenet-ext.jar $out/share/freenet - cp dist/freenet.jar $out/share/freenet +in stdenv.mkDerivation { + name = "freenet-${version}"; + inherit version; - cat <<EOF > $out/bin/freenet.wrapped - #!${stdenv.shell} - ${jdk.jre}/bin/java -cp $out/share/freenet/bcprov-jdk15on-152.jar:$out/share/freenet/freenet-ext.jar:$out/share/freenet/freenet.jar \\ - -Xmx1024M freenet.node.NodeStarter - EOF - chmod +x $out/bin/freenet.wrapped - makeWrapper $freenetWrapper $out/bin/freenet \ - --set FREENET_ROOT "$out" \ - --set FREENET_SEEDNODES "${seednodes}" + src = substituteAll { + src = ./freenetWrapper; + inherit bash coreutils seednodes; + freenet = freenet-jars; + jre = jdk.jre; + }; + + jars = freenet-jars; + + phases = [ "installPhase" ]; + + installPhase = '' + mkdir -p $out/bin + cp $src $out/bin/freenet + chmod +x $out/bin/freenet + ln -s ${freenet-jars}/share $out/share ''; meta = { diff --git a/pkgs/applications/networking/p2p/freenet/freenetWrapper b/pkgs/applications/networking/p2p/freenet/freenetWrapper index c1667f158b97..6df7f4924587 100755 --- a/pkgs/applications/networking/p2p/freenet/freenetWrapper +++ b/pkgs/applications/networking/p2p/freenet/freenetWrapper @@ -1,4 +1,6 @@ -#! /usr/bin/env bash +#! @bash@/bin/bash + +PATH=@coreutils@/bin:$PATH export FREENET_HOME="$HOME/.local/share/freenet" if [ -n "$XDG_DATA_HOME" ] @@ -9,8 +11,8 @@ if [ ! -d $FREENET_HOME ]; then mkdir -p $FREENET_HOME fi -cp -u $FREENET_SEEDNODES $FREENET_HOME/seednodes.fref +cp -u @seednodes@ $FREENET_HOME/seednodes.fref chmod u+rw $FREENET_HOME/seednodes.fref cd $FREENET_HOME -exec $FREENET_ROOT/bin/freenet.wrapped "$@" +@jre@/bin/java -cp @freenet@/share/freenet/bcprov-jdk15on-152.jar:@freenet@/share/freenet/freenet-ext.jar:@freenet@/share/freenet/freenet.jar -Xmx1024M freenet.node.NodeStarter diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index f8c025ba2418..bc5289f80935 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, which -, boost, libtorrentRasterbar, qt4 +, boost, libtorrentRasterbar, qt5 , debugSupport ? false # Debugging , guiSupport ? true, dbus_libs ? null # GUI (disable to run headless) , webuiSupport ? true # WebUI @@ -10,16 +10,16 @@ assert guiSupport -> (dbus_libs != null); with stdenv.lib; stdenv.mkDerivation rec { name = "qbittorrent-${version}"; - version = "3.2.3"; + version = "3.3.1"; src = fetchurl { url = "mirror://sourceforge/qbittorrent/${name}.tar.xz"; - sha256 = "05590ak4nnqkah8dy71cxf7mqv6phw0ih1719dm761mxf8vrz9w6"; + sha256 = "1li9law732n4vc7sn6i92pwxn8li7ypqaxcmfpm17kk978immlfs"; }; nativeBuildInputs = [ pkgconfig which ]; - buildInputs = [ boost libtorrentRasterbar qt4 ] + buildInputs = [ boost libtorrentRasterbar qt5.qtbase qt5.qttools ] ++ optional guiSupport dbus_libs; configureFlags = [ @@ -29,6 +29,9 @@ stdenv.mkDerivation rec { (if webuiSupport then "" else "--disable-webui") ] ++ optional debugSupport "--enable-debug"; + # The lrelease binary is named lrelease instead of lrelease-qt4 + patches = [ ./fix-lrelease.patch]; + # https://github.com/qbittorrent/qBittorrent/issues/1992 enableParallelBuilding = false; diff --git a/pkgs/applications/networking/p2p/qbittorrent/fix-lrelease.patch b/pkgs/applications/networking/p2p/qbittorrent/fix-lrelease.patch new file mode 100644 index 000000000000..9e3e484667fe --- /dev/null +++ b/pkgs/applications/networking/p2p/qbittorrent/fix-lrelease.patch @@ -0,0 +1,13 @@ +diff --git a/qm_gen.pri b/qm_gen.pri +index ed29b76..2d5990c 100644 +--- a/qm_gen.pri ++++ b/qm_gen.pri +@@ -5,7 +5,7 @@ isEmpty(QMAKE_LRELEASE) { + win32|os2:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\\lrelease.exe + else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease + unix { +- !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease-qt4 } ++ !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease } + } else { + !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease } + } |