diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-04-17 02:39:12 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-04-20 18:55:47 +0300 |
| commit | 2f2e9b06b5098bb5b65bea7144f62a006b306dcf (patch) | |
| tree | 73ed56d2458ffc749bca9c3e506ad18a51727cd8 /pkgs | |
| parent | a1fc9606f2ac655408605cc723cd2a3c3317a84c (diff) | |
| download | nixpkgs-2f2e9b06b5098bb5b65bea7144f62a006b306dcf.tar nixpkgs-2f2e9b06b5098bb5b65bea7144f62a006b306dcf.tar.gz nixpkgs-2f2e9b06b5098bb5b65bea7144f62a006b306dcf.tar.bz2 nixpkgs-2f2e9b06b5098bb5b65bea7144f62a006b306dcf.tar.lz nixpkgs-2f2e9b06b5098bb5b65bea7144f62a006b306dcf.tar.xz nixpkgs-2f2e9b06b5098bb5b65bea7144f62a006b306dcf.tar.zst nixpkgs-2f2e9b06b5098bb5b65bea7144f62a006b306dcf.zip | |
retroshare06: move to qmake4Hook
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/p2p/retroshare/0.6.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/0.6.nix b/pkgs/applications/networking/p2p/retroshare/0.6.nix index 020d0017053..67028fb5dec 100644 --- a/pkgs/applications/networking/p2p/retroshare/0.6.nix +++ b/pkgs/applications/networking/p2p/retroshare/0.6.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, qt, libupnp, gpgme, gnome3, glib, libssh, pkgconfig, protobuf, bzip2 +{ stdenv, fetchFromGitHub, cmake, qt4, qmake4Hook, libupnp, gpgme, gnome3, glib, libssh, pkgconfig, protobuf, bzip2 , libXScrnSaver, speex, curl, libxml2, libxslt, sqlcipher, libmicrohttpd, opencv }: stdenv.mkDerivation { @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "189qndkfq9kgv3qi3wx8ivla4j8fxr4iv7c8y9rjrjaz8jwdkn5x"; }; - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/glib-2.0 -I${glib.dev}/lib/glib-2.0/include -I${libxml2.dev}/include/libxml2 -I${sqlcipher}/include/sqlcipher"; + NIX_CFLAGS_COMPILE = [ "-I${glib.dev}/include/glib-2.0" "-I${glib.dev}/lib/glib-2.0/include" "-I${libxml2.dev}/include/libxml2" "-I${sqlcipher}/include/sqlcipher" ]; patchPhase = '' # Fix build error @@ -29,11 +29,11 @@ stdenv.mkDerivation { # retroshare-gui/src/retroshare-gui.pro \ # retroshare-nogui/src/retroshare-nogui.pro - buildInputs = [ speex qt libupnp gpgme gnome3.libgnome_keyring glib libssh pkgconfig + buildInputs = [ speex qt4 libupnp gpgme gnome3.libgnome_keyring glib libssh pkgconfig qmake4Hook protobuf bzip2 libXScrnSaver curl libxml2 libxslt sqlcipher libmicrohttpd opencv ]; - configurePhase = '' - qmake PREFIX=$out DESTDIR=$out RetroShare.pro + preConfigure = '' + qmakeFlags="$qmakeFlags DESTDIR=$out" ''; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7ed4d8859c7..78c4e3d3fdc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13660,9 +13660,7 @@ in qt = qt4; }; - retroshare06 = lowPrio (callPackage ../applications/networking/p2p/retroshare/0.6.nix { - qt = qt4; - }); + retroshare06 = lowPrio (callPackage ../applications/networking/p2p/retroshare/0.6.nix { }); RhythmDelay = callPackage ../applications/audio/RhythmDelay { }; |