diff --git a/pkgs/development/libraries/polkit-qt-1/qt-4.nix b/pkgs/development/libraries/polkit-qt-1/qt-4.nix new file mode 100644 index 00000000000..fa5c77aa27a --- /dev/null +++ b/pkgs/development/libraries/polkit-qt-1/qt-4.nix @@ -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 ]; + }; +} diff --git a/pkgs/development/libraries/polkit-qt-1/default.nix b/pkgs/development/libraries/polkit-qt-1/qt-5.nix similarity index 65% rename from pkgs/development/libraries/polkit-qt-1/default.nix rename to pkgs/development/libraries/polkit-qt-1/qt-5.nix index dc28d1398bc..d9b2afbd801 100644 --- a/pkgs/development/libraries/polkit-qt-1/default.nix +++ b/pkgs/development/libraries/polkit-qt-1/qt-5.nix @@ -1,13 +1,9 @@ -{ stdenv, fetchurl, cmake, pkgconfig, polkit, automoc4, glib -, qt4 ? null -, withQt5 ? false, qtbase ? null }: +{ stdenv, fetchurl, cmake, pkgconfig, polkit, glib, qtbase }: with stdenv.lib; -assert (withQt5 -> qtbase != null); assert (!withQt5 -> qt4 != null); - stdenv.mkDerivation { - name = "polkit-qt-1-0.112.0"; + name = "polkit-qt-1-qt5-0.112.0"; outputs = [ "dev" "out" ]; @@ -16,9 +12,9 @@ stdenv.mkDerivation { 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 = '' cmakeFlags+=" -DCMAKE_INSTALL_LIBDIR=''${!outputLib}/lib" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8132ccd5aa5..33bdf7235ef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8469,7 +8469,7 @@ in 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; }; @@ -8581,9 +8581,7 @@ in phonon-backend-vlc = callPackage ../development/libraries/phonon-backend-vlc/qt5 { }; - polkit-qt = callPackage ../development/libraries/polkit-qt-1 { - withQt5 = true; - }; + polkit-qt = callPackage ../development/libraries/polkit-qt-1/qt-5.nix { }; poppler = callPackage ../development/libraries/poppler { lcms = lcms2;