mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-02 15:41:48 +00:00
retroshare: move to qmake4Hook
This commit is contained in:
parent
2f2e9b06b5
commit
04e1b8eac4
@ -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 }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
@ -9,7 +9,7 @@ stdenv.mkDerivation {
|
||||
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 = ''
|
||||
sed -i 's/UpnpString_get_String(es_event->PublisherUrl)/es_event->PublisherUrl/' \
|
||||
@ -22,13 +22,13 @@ stdenv.mkDerivation {
|
||||
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 ];
|
||||
|
||||
sourceRoot = "retroshare-0.5.5/src";
|
||||
|
||||
configurePhase = ''
|
||||
qmake PREFIX=$out DESTDIR=$out RetroShare.pro
|
||||
preConfigure = ''
|
||||
qmakeFlags="$qmakeFlags DESTDIR=$out"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
|
@ -13656,9 +13656,7 @@ in
|
||||
|
||||
remotebox = callPackage ../applications/virtualization/remotebox { };
|
||||
|
||||
retroshare = callPackage ../applications/networking/p2p/retroshare {
|
||||
qt = qt4;
|
||||
};
|
||||
retroshare = callPackage ../applications/networking/p2p/retroshare { };
|
||||
|
||||
retroshare06 = lowPrio (callPackage ../applications/networking/p2p/retroshare/0.6.nix { });
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user