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

retroshare: move to qmake4Hook

Browse Source
This commit is contained in:
Nikolay Amiantov 2016-04-17 02:39:30 +03:00
parent 2f2e9b06b5
commit 04e1b8eac4
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/networking/p2p/retroshare/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, qt, libupnp, gpgme, gnome3, glib, libssh, pkgconfig, protobuf, bzip2 { stdenv, fetchurl, cmake, qt4, qmake4Hook, libupnp, gpgme, gnome3, glib, libssh, pkgconfig, protobuf, bzip2
, libXScrnSaver, speex, curl, libxml2, libxslt }: , libXScrnSaver, speex, curl, libxml2, libxslt }:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -9,7 +9,7 @@ stdenv.mkDerivation {
sha256 = "0l2n4pr1hq66q6qa073hrdx3s3d7iw54z8ay1zy82zhk2rwhsavp"; sha256 = "0l2n4pr1hq66q6qa073hrdx3s3d7iw54z8ay1zy82zhk2rwhsavp";
}; };
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/glib-2.0 -I${glib.dev}/lib/glib-2.0/include -I${libxml2.dev}/include/libxml2"; NIX_CFLAGS_COMPILE = [ "-I${glib.dev}/include/glib-2.0" "-I${glib.dev}/lib/glib-2.0/include" "-I${libxml2.dev}/include/libxml2" ];
patchPhase = '' patchPhase = ''
sed -i 's/UpnpString_get_String(es_event->PublisherUrl)/es_event->PublisherUrl/' \ sed -i 's/UpnpString_get_String(es_event->PublisherUrl)/es_event->PublisherUrl/' \
@ -22,13 +22,13 @@ stdenv.mkDerivation {
libretroshare/src/rsserver/rsinit.cc libretroshare/src/rsserver/rsinit.cc
''; '';
buildInputs = [ speex qt libupnp gpgme gnome3.libgnome_keyring glib libssh pkgconfig buildInputs = [ speex qt4 qmake4Hook libupnp gpgme gnome3.libgnome_keyring glib libssh pkgconfig
protobuf bzip2 libXScrnSaver curl libxml2 libxslt ]; protobuf bzip2 libXScrnSaver curl libxml2 libxslt ];
sourceRoot = "retroshare-0.5.5/src"; sourceRoot = "retroshare-0.5.5/src";
configurePhase = '' preConfigure = ''
qmake PREFIX=$out DESTDIR=$out RetroShare.pro qmakeFlags="$qmakeFlags DESTDIR=$out"
''; '';
postInstall = '' postInstall = ''

4
pkgs/top-level/all-packages.nix
View File

@ -13656,9 +13656,7 @@ in
remotebox = callPackage ../applications/virtualization/remotebox { }; remotebox = callPackage ../applications/virtualization/remotebox { };
retroshare = callPackage ../applications/networking/p2p/retroshare { retroshare = callPackage ../applications/networking/p2p/retroshare { };
qt = qt4;
};
retroshare06 = lowPrio (callPackage ../applications/networking/p2p/retroshare/0.6.nix { }); retroshare06 = lowPrio (callPackage ../applications/networking/p2p/retroshare/0.6.nix { });