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

accounts-qt: build with Qt 5.5

This commit is contained in:
Thomas Tuegel 2015-09-27 10:22:39 -05:00
parent 4a3d7eae7e
commit dfbcab342a
3 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/accounts-qt/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkgconfig, qt5 }:
{ stdenv, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkgconfig, qtbase }:
let version = "1.13"; in
stdenv.mkDerivation {
@ -18,7 +18,7 @@ stdenv.mkDerivation {
maintainers = with maintainers; [ nckx ];
};
buildInputs = [ glib libaccounts-glib qt5.base ];
buildInputs = [ glib libaccounts-glib qtbase ];
nativeBuildInputs = [ doxygen pkgconfig ];
configurePhase = ''

27
pkgs/development/libraries/accounts-qt/old.nix Normal file
View File

@ -0,0 +1,27 @@
{ stdenv, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkgconfig, qt5 }:
let version = "1.13"; in
stdenv.mkDerivation {
name = "accounts-qt-${version}";
src = fetchFromGitLab {
sha256 = "1gpkgw05dwsf2wk5cy3skgss3kw6mqh7iv3fadrxqxfc1za1xmyl";
rev = version;
repo = "libaccounts-qt";
owner = "accounts-sso";
};
meta = with stdenv.lib; {
description = "Qt library for accessing the online accounts database";
homepage = "http://code.google.com/p/accounts-sso/";
license = licenses.lgpl21;
maintainers = with maintainers; [ nckx ];
};
buildInputs = [ glib libaccounts-glib qt5.base ];
nativeBuildInputs = [ doxygen pkgconfig ];
configurePhase = ''
qmake PREFIX=$out LIBDIR=$out/lib CMAKE_CONFIG_PATH=$out/lib/cmake
'';
}

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

@ -5843,10 +5843,10 @@ let
accelio = callPackage ../development/libraries/accelio { stdenv = overrideCC stdenv gcc5; };
accounts-qt = callPackage ../development/libraries/accounts-qt { };
accountsservice = callPackage ../development/libraries/accountsservice { };
accounts-qt = callPackage ../development/libraries/accounts-qt/old.nix {};
acl = callPackage ../development/libraries/acl { };
activemq = callPackage ../development/libraries/apache-activemq { };
@ -7934,6 +7934,8 @@ let
qt5LibsFun = self: with self; {
accounts-qt = callPackage ../development/libraries/accounts-qt { };
libdbusmenu = callPackage ../development/libraries/libdbusmenu-qt/qt-5.5.nix { };
phonon = callPackage ../development/libraries/phonon/qt5 { };