From e96bc485dba4cbae35f0dc9215b07b96b5491329 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 3 Feb 2014 21:54:08 +0100 Subject: [PATCH] retroshare: 0.5.1d -> 0.5.5c --- .../networking/p2p/retroshare/default.nix | 46 +++++++++++-------- 1 file changed, 28 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix index d4e3aa91cc0..3ae4f2a7483 100644 --- a/pkgs/applications/networking/p2p/retroshare/default.nix +++ b/pkgs/applications/networking/p2p/retroshare/default.nix @@ -1,28 +1,38 @@ -{stdenv, fetchurl, qt, libupnp, gpgme, libgnome_keyring, glib}: - -throw "still fails to build" +{ stdenv, fetchurl, cmake, qt, libupnp, gpgme, gnome3, glib, libssh, pkgconfig, protobuf, bzip2 +, libXScrnSaver, speex, curl, libxml2, libxslt }: stdenv.mkDerivation { - name = "retroshare-0.5.1d"; + name = "retroshare-0.5.5c"; src = fetchurl { - url = mirror://sourceforge/retroshare/RetroShare-v0.5.1d.tar.gz; - sha256 = "15971wxx8djwcxn170jyn0mlh7cfzqsf031aa849wr9z234gwrcn"; + url = mirror://sourceforge/project/retroshare/RetroShare/0.5.5c/retroshare_0.5.5-0.7068.tar.gz; + sha256 = "0l2n4pr1hq66q6qa073hrdx3s3d7iw54z8ay1zy82zhk2rwhsavp"; }; - buildInputs = [ qt libupnp gpgme libgnome_keyring glib ]; + NIX_CFLAGS_COMPILE = "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include -I${libxml2}/include/libxml2"; - buildPhase = '' - cd libbitdht/src - qmake libbitdht.pro PREFIX=$out - make - cd ../.. - cd libretroshare/src - qmake libretroshare.pro PREFIX=$out - make - cd ../../src - qmake libretroshare.pro PREFIX=$out - make + patchPhase = "sed -i 's/UpnpString_get_String(es_event->PublisherUrl)/es_event->PublisherUrl/' libretroshare/src/upnp/UPnPBase.cpp"; + + buildInputs = [ speex qt libupnp gpgme gnome3.libgnome_keyring glib libssh pkgconfig + protobuf bzip2 libXScrnSaver curl libxml2 libxslt ]; + + sourceRoot = "retroshare-0.5.5/src"; + + configurePhase = '' + qmake PREFIX=$out DESTDIR=$out RetroShare.pro ''; + postInstall = '' + mkdir -p $out/bin + ln -s $out/retroshare-nogui $out/bin + ln -s $out/RetroShare $out/bin + ''; + + meta = with stdenv.lib; { + description = ""; + homepage = http://retroshare.sourceforge.net/; + #license = licenses.bsd2; + platforms = platforms.linux; + maintainers = [ maintainers.iElectric ]; + }; }