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

polkit-qt-1: separate Qt 4 and Qt 5 versions

Browse Source
This commit is contained in:
Thomas Tuegel 2016-04-19 06:08:06 -05:00
parent 7cc52a65b0
commit afef9d4b0a
3 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/development/libraries/polkit-qt-1/qt-4.nix Normal file
View File

@ -0,0 +1,21 @@
{ stdenv, fetchurl, cmake, pkgconfig, polkit, automoc4, glib, qt4 }:
with stdenv.lib;
stdenv.mkDerivation {
name = "polkit-qt-1-qt4-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 pkgconfig automoc4 ];
propagatedBuildInputs = [ polkit glib qt4 ];
meta = {
description = "A Qt wrapper around PolKit";
maintainers = with stdenv.lib.maintainers; [ ttuegel ];
};
}

12
pkgs/development/libraries/polkit-qt-1/default.nix → pkgs/development/libraries/polkit-qt-1/qt-5.nix
View File

@ -1,13 +1,9 @@
{ stdenv, fetchurl, cmake, pkgconfig, polkit, automoc4, glib { stdenv, fetchurl, cmake, pkgconfig, polkit, glib, qtbase }:
, qt4 ? null
, withQt5 ? false, qtbase ? null }:
with stdenv.lib; with stdenv.lib;
assert (withQt5 -> qtbase != null); assert (!withQt5 -> qt4 != null);
stdenv.mkDerivation { stdenv.mkDerivation {
name = "polkit-qt-1-0.112.0"; name = "polkit-qt-1-qt5-0.112.0";
outputs = [ "dev" "out" ]; outputs = [ "dev" "out" ];
@ -16,9 +12,9 @@ stdenv.mkDerivation {
sha256 = "1ip78x20hjqvm08kxhp6gb8hf6k5n6sxyx6kk2yvvq53djzh7yv7"; sha256 = "1ip78x20hjqvm08kxhp6gb8hf6k5n6sxyx6kk2yvvq53djzh7yv7";
}; };
nativeBuildInputs = [ cmake pkgconfig ] ++ optional (!withQt5) automoc4; nativeBuildInputs = [ cmake pkgconfig ];
propagatedBuildInputs = [ polkit glib ] ++ [(if withQt5 then qtbase else qt4)]; propagatedBuildInputs = [ polkit glib qtbase ];
preConfigure = '' preConfigure = ''
cmakeFlags+=" -DCMAKE_INSTALL_LIBDIR=''${!outputLib}/lib" cmakeFlags+=" -DCMAKE_INSTALL_LIBDIR=''${!outputLib}/lib"

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

@ -8469,7 +8469,7 @@ in
spidermonkey = spidermonkey_17; spidermonkey = spidermonkey_17;
}; };
polkit_qt4 = callPackage ../development/libraries/polkit-qt-1 { }; polkit_qt4 = callPackage ../development/libraries/polkit-qt-1/qt-4.nix { };
poppler = callPackage ../development/libraries/poppler { lcms = lcms2; }; poppler = callPackage ../development/libraries/poppler { lcms = lcms2; };
@ -8581,9 +8581,7 @@ in
phonon-backend-vlc = callPackage ../development/libraries/phonon-backend-vlc/qt5 { }; phonon-backend-vlc = callPackage ../development/libraries/phonon-backend-vlc/qt5 { };
polkit-qt = callPackage ../development/libraries/polkit-qt-1 { polkit-qt = callPackage ../development/libraries/polkit-qt-1/qt-5.nix { };
withQt5 = true;
};
poppler = callPackage ../development/libraries/poppler { poppler = callPackage ../development/libraries/poppler {
lcms = lcms2; lcms = lcms2;