diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2014-11-05 15:00:44 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-11-05 15:00:44 +0100 |
commit | 52404a868ddc6665da66f54dab5f102908843784 (patch) | |
tree | da856ff0f583e67a7a209d8d75826f796df5a3bb /pkgs/applications/networking/p2p | |
parent | c0e2aceef46033e43ab8b4f6aa0b36b25ba35f3d (diff) | |
parent | 8e02bde1a8ea913ecaa4801898057968412efa01 (diff) |
Merge recent master into staging
Nixpkgs Hydra: ?compare=1157272 TODO: port e22889064f82be3 Conflicts: nixos/tests/gnome3_10.nix (auto-solved) pkgs/applications/video/aegisub/default.nix pkgs/development/libraries/boost/1.55.nix
Diffstat (limited to 'pkgs/applications/networking/p2p')
4 files changed, 46 insertions, 8 deletions
diff --git a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix index ba71e1985b469..e4ca6d423cdc8 100644 --- a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix +++ b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "3d9170645450f9cb0a605278b8646fec2110b9637910d86fd27cf245cbe24eaf"; }; - buildInputs = [ cmake pkgconfig qt4 boost boost.lib bzip2 libX11 pcre libidn lua5 miniupnpc aspell gettext ]; + buildInputs = [ cmake pkgconfig qt4 boost bzip2 libX11 pcre libidn lua5 miniupnpc aspell gettext ]; cmakeFlags = '' -DUSE_ASPELL=ON diff --git a/pkgs/applications/networking/p2p/frostwire/default.nix b/pkgs/applications/networking/p2p/frostwire/default.nix new file mode 100644 index 0000000000000..1a598ad17b0fd --- /dev/null +++ b/pkgs/applications/networking/p2p/frostwire/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, jre }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + version = "6.0.0"; + name = "frostwire-${version}"; + + src = fetchurl { + url = "http://dl.frostwire.com/frostwire/${version}/frostwire-${version}.x86_64.tar.gz"; + sha256 = "73d6e3db9971becf1c5b7faf12b62fa3ac0a243ac06b8b4eada9118f56990177"; + }; + + inherit jre; + + installPhase = '' + jar=$(ls */*.jar) + + mkdir -p $out/share/java + mv $jar $out/share/java + + mkdir -p $out/bin + cat > $out/bin/frostwire <<EOF + #! $SHELL -e + exec $out/share/java/frostwire + EOF + chmod +x $out/bin/frostwire + ''; + + meta = { + homepage = http://www.frostwire.com/; + description = "BitTorrent Client and Cloud File Downloader"; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.gavin ]; + }; +} diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index ccf129881f5dc..51c43771bcf7d 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -2,18 +2,21 @@ , pkgconfig }: stdenv.mkDerivation rec { - name = "qbittorrent-3.1.10"; + name = "qbittorrent-3.1.11"; src = fetchurl { url = "mirror://sourceforge/qbittorrent/${name}.tar.xz"; - sha256 = "0xhqli191r5v9b5x6wj1wsjlj6svf6ldgzl7jza39q3ipr5c2pg6"; + sha256 = "0qvz8ifk01b9sw9x5yh3b5kmssx5yi026zvgvabdvfaqkvcmw43i"; }; - buildInputs = [ qt4 which dbus_libs boost libtorrentRasterbar - pkgconfig ]; + buildInputs = [ + qt4 which dbus_libs boost libtorrentRasterbar pkgconfig + ]; - configureFlags = "--with-libboost-inc=${boost}/include " - + "--with-libboost-lib=${boost}/lib"; + configureFlags = [ + "--with-libboost-lib=${boost.lib}/lib" + "--with-libboost-inc=${boost.dev}/include" + ]; # https://github.com/qbittorrent/qBittorrent/issues/1992 #enableParallelBuilding = true; diff --git a/pkgs/applications/networking/p2p/twister/default.nix b/pkgs/applications/networking/p2p/twister/default.nix index 13f6b2bcce4a8..e6fd674e9e7ca 100644 --- a/pkgs/applications/networking/p2p/twister/default.nix +++ b/pkgs/applications/networking/p2p/twister/default.nix @@ -26,7 +26,6 @@ in stdenv.mkDerivation rec { configureFlags = [ "--with-libgeoip" "--with-libiconv" - "--with-boost=${boost}" "--disable-deprecated-functions" "--enable-tests" "--enable-python-binding" |