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

retroshare06: move to qmake4Hook

Browse Source
This commit is contained in:
Nikolay Amiantov 2016-04-17 02:39:12 +03:00
parent a1fc9606f2
commit 2f2e9b06b5
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/0.6.nix
View File

@ -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;

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

@ -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 { };