diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-04-17 02:39:30 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-04-20 18:55:47 +0300 |
| commit | 04e1b8eac42c90c213f7ffc880a29b3e78e73f5f (patch) | |
| tree | 62c25f86705dfb42565a0fb8a6246d8b7cf42a47 /pkgs | |
| parent | 2f2e9b06b5098bb5b65bea7144f62a006b306dcf (diff) | |
| download | nixlib-04e1b8eac42c90c213f7ffc880a29b3e78e73f5f.tar nixlib-04e1b8eac42c90c213f7ffc880a29b3e78e73f5f.tar.gz nixlib-04e1b8eac42c90c213f7ffc880a29b3e78e73f5f.tar.bz2 nixlib-04e1b8eac42c90c213f7ffc880a29b3e78e73f5f.tar.lz nixlib-04e1b8eac42c90c213f7ffc880a29b3e78e73f5f.tar.xz nixlib-04e1b8eac42c90c213f7ffc880a29b3e78e73f5f.tar.zst nixlib-04e1b8eac42c90c213f7ffc880a29b3e78e73f5f.zip | |
retroshare: move to qmake4Hook
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/p2p/retroshare/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 6 insertions, 8 deletions
diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix index e7fe79d66a56..314d0557e9f9 100644 --- a/pkgs/applications/networking/p2p/retroshare/default.nix +++ b/pkgs/applications/networking/p2p/retroshare/default.nix @@ -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 = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78c4e3d3fdcc..510ccc46e8c2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }); |