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

polkitQt: build with Qt 5.5

Browse Source
This commit is contained in:
Thomas Tuegel 2015-09-27 09:58:27 -05:00
parent 52798834a8
commit e2c25b2f60
3 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/libraries/polkit-qt-1/default.nix
View File

@ -1,7 +1,10 @@
{ stdenv, fetchurl, cmake, pkgconfig, polkit, automoc4, glib
, qt4 ? null, qt5 ? null, withQt5 ? false }:
, qt4 ? null
, withQt5 ? false, qtbase ? null }:
assert (withQt5 -> qt5 != null); assert (!withQt5 -> qt4 != null);
with stdenv.lib;
assert (withQt5 -> qtbase != null); assert (!withQt5 -> qt4 != null);
stdenv.mkDerivation {
name = "polkit-qt-1-0.112.0";
@ -11,9 +14,9 @@ stdenv.mkDerivation {
sha256 = "1ip78x20hjqvm08kxhp6gb8hf6k5n6sxyx6kk2yvvq53djzh7yv7";
};
nativeBuildInputs = [ cmake automoc4 pkgconfig ];
nativeBuildInputs = [ cmake pkgconfig ] ++ optional (!withQt5) automoc4;
propagatedBuildInputs = [ polkit glib ] ++ (if withQt5 then [qt5.base] else [qt4]);
propagatedBuildInputs = [ polkit glib ] ++ [(if withQt5 then qtbase else qt4)];
meta = {
description = "A Qt wrapper around PolKit";

22
pkgs/development/libraries/polkit-qt-1/old.nix Normal file
View File

@ -0,0 +1,22 @@
{ stdenv, fetchurl, cmake, pkgconfig, polkit, automoc4, glib
, qt4 ? null, qt5 ? null, withQt5 ? false }:
assert (withQt5 -> qt5 != null); assert (!withQt5 -> qt4 != null);
stdenv.mkDerivation {
name = "polkit-qt-1-0.112.0";
src = fetchurl {
url = "mirror://kde/stable/apps/KDE4.x/admin/polkit-qt-1-0.112.0.tar.bz2";
sha256 = "1ip78x20hjqvm08kxhp6gb8hf6k5n6sxyx6kk2yvvq53djzh7yv7";
};
nativeBuildInputs = [ cmake automoc4 pkgconfig ];
propagatedBuildInputs = [ polkit glib ] ++ (if withQt5 then [qt5.base] else [qt4]);
meta = {
description = "A Qt wrapper around PolKit";
maintainers = with stdenv.lib.maintainers; [ ttuegel ];
};
}

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

@ -7803,9 +7803,7 @@ let
polkit_qt4 = callPackage ../development/libraries/polkit-qt-1 { };
polkit_qt5 = callPackage ../development/libraries/polkit-qt-1 {
withQt5 = true;
};
polkit_qt5 = callPackage ../development/libraries/polkit-qt-1/old.nix { withQt5 = true; };
policykit = callPackage ../development/libraries/policykit { };
@ -7909,6 +7907,10 @@ let
phonon_backend_vlc = callPackage ../development/libraries/phonon-backend-vlc/qt5 { };
polkitQt = callPackage ../development/libraries/polkit-qt-1 {
withQt5 = true;
};
};
qt55Libs = lib.makeScope qt55.newScope qt5LibsFun;