lol

polkitQt: build with Qt 5.5

+34 -7
+7 -4
pkgs/development/libraries/polkit-qt-1/default.nix
··· 1 1 { stdenv, fetchurl, cmake, pkgconfig, polkit, automoc4, glib 2 - , qt4 ? null, qt5 ? null, withQt5 ? false }: 2 + , qt4 ? null 3 + , withQt5 ? false, qtbase ? null }: 4 + 5 + with stdenv.lib; 3 6 4 - assert (withQt5 -> qt5 != null); assert (!withQt5 -> qt4 != null); 7 + assert (withQt5 -> qtbase != null); assert (!withQt5 -> qt4 != null); 5 8 6 9 stdenv.mkDerivation { 7 10 name = "polkit-qt-1-0.112.0"; ··· 11 14 sha256 = "1ip78x20hjqvm08kxhp6gb8hf6k5n6sxyx6kk2yvvq53djzh7yv7"; 12 15 }; 13 16 14 - nativeBuildInputs = [ cmake automoc4 pkgconfig ]; 17 + nativeBuildInputs = [ cmake pkgconfig ] ++ optional (!withQt5) automoc4; 15 18 16 - propagatedBuildInputs = [ polkit glib ] ++ (if withQt5 then [qt5.base] else [qt4]); 19 + propagatedBuildInputs = [ polkit glib ] ++ [(if withQt5 then qtbase else qt4)]; 17 20 18 21 meta = { 19 22 description = "A Qt wrapper around PolKit";
+22
pkgs/development/libraries/polkit-qt-1/old.nix
··· 1 + { stdenv, fetchurl, cmake, pkgconfig, polkit, automoc4, glib 2 + , qt4 ? null, qt5 ? null, withQt5 ? false }: 3 + 4 + assert (withQt5 -> qt5 != null); assert (!withQt5 -> qt4 != null); 5 + 6 + stdenv.mkDerivation { 7 + name = "polkit-qt-1-0.112.0"; 8 + 9 + src = fetchurl { 10 + url = "mirror://kde/stable/apps/KDE4.x/admin/polkit-qt-1-0.112.0.tar.bz2"; 11 + sha256 = "1ip78x20hjqvm08kxhp6gb8hf6k5n6sxyx6kk2yvvq53djzh7yv7"; 12 + }; 13 + 14 + nativeBuildInputs = [ cmake automoc4 pkgconfig ]; 15 + 16 + propagatedBuildInputs = [ polkit glib ] ++ (if withQt5 then [qt5.base] else [qt4]); 17 + 18 + meta = { 19 + description = "A Qt wrapper around PolKit"; 20 + maintainers = with stdenv.lib.maintainers; [ ttuegel ]; 21 + }; 22 + }
+5 -3
pkgs/top-level/all-packages.nix
··· 7803 7803 7804 7804 polkit_qt4 = callPackage ../development/libraries/polkit-qt-1 { }; 7805 7805 7806 - polkit_qt5 = callPackage ../development/libraries/polkit-qt-1 { 7807 - withQt5 = true; 7808 - }; 7806 + polkit_qt5 = callPackage ../development/libraries/polkit-qt-1/old.nix { withQt5 = true; }; 7809 7807 7810 7808 policykit = callPackage ../development/libraries/policykit { }; 7811 7809 ··· 7908 7906 phonon_backend_gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer/qt5 { }; 7909 7907 7910 7908 phonon_backend_vlc = callPackage ../development/libraries/phonon-backend-vlc/qt5 { }; 7909 + 7910 + polkitQt = callPackage ../development/libraries/polkit-qt-1 { 7911 + withQt5 = true; 7912 + }; 7911 7913 7912 7914 }; 7913 7915