diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2014-11-17 19:00:17 -0600 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2014-11-20 11:10:39 -0600 |
| commit | dfaa39db41de3833c66260f1659e914ca77611ed (patch) | |
| tree | 6a921f0cb3851e27dc43bfda69f67e193864beb8 /pkgs/development/libraries/polkit-qt-1 | |
| parent | ad38cdac8ab9526d9eb15edcf5cb005103a9fef0 (diff) | |
| download | nixpkgs-dfaa39db41de3833c66260f1659e914ca77611ed.tar nixpkgs-dfaa39db41de3833c66260f1659e914ca77611ed.tar.gz nixpkgs-dfaa39db41de3833c66260f1659e914ca77611ed.tar.bz2 nixpkgs-dfaa39db41de3833c66260f1659e914ca77611ed.tar.lz nixpkgs-dfaa39db41de3833c66260f1659e914ca77611ed.tar.xz nixpkgs-dfaa39db41de3833c66260f1659e914ca77611ed.tar.zst nixpkgs-dfaa39db41de3833c66260f1659e914ca77611ed.zip | |
polkit-qt-1: Qt 5 support
polkit-qt-1 is upgraded to the latest version, which supports Qt 5. The attributes are also renamed to differentiate the Qt 4 and Qt 5 branches. The prior naming scheme differentiated between polkit-qt-1 and polkit-qt, but we no longer package the latter.
Diffstat (limited to 'pkgs/development/libraries/polkit-qt-1')
| -rw-r--r-- | pkgs/development/libraries/polkit-qt-1/default.nix | 20 | ||||
| -rw-r--r-- | pkgs/development/libraries/polkit-qt-1/polkit-install.patch | 12 |
2 files changed, 11 insertions, 21 deletions
diff --git a/pkgs/development/libraries/polkit-qt-1/default.nix b/pkgs/development/libraries/polkit-qt-1/default.nix index 13bc992d026..c60ae560fe5 100644 --- a/pkgs/development/libraries/polkit-qt-1/default.nix +++ b/pkgs/development/libraries/polkit-qt-1/default.nix @@ -1,20 +1,22 @@ -{ stdenv, fetchurl, cmake, qt4, pkgconfig, polkit, automoc4, glib }: +{ stdenv, fetchurl, cmake, pkgconfig, polkit, automoc4, glib +, qt4 ? null, qt5 ? null, withQt5 ? false }: -stdenv.mkDerivation rec { - name = "polkit-qt-1-0.103.0"; +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/${name}.tar.bz2"; - sha256 = "0k17sb70ywk94dmncnkyig03sg1hcfbhi5wlc77xf3rxirmmccif"; + url = "mirror://kde/stable/apps/KDE4.x/admin/polkit-qt-1-0.112.0.tar.bz2"; + sha256 = "1ip78x20hjqvm08kxhp6gb8hf6k5n6sxyx6kk2yvvq53djzh7yv7"; }; - patches = [ ./polkit-install.patch ]; - - nativeBuildInputs = [ cmake automoc4 ]; + nativeBuildInputs = [ cmake automoc4 pkgconfig ]; - propagatedBuildInputs = [ polkit glib qt4 ]; + propagatedBuildInputs = [ polkit glib (if withQt5 then qt5 else qt4) ]; meta = { description = "A Qt wrapper around PolKit"; + maintainers = with stdenv.lib.maintainers; [ ttuegel ]; }; } diff --git a/pkgs/development/libraries/polkit-qt-1/polkit-install.patch b/pkgs/development/libraries/polkit-qt-1/polkit-install.patch deleted file mode 100644 index 79beda2a318..00000000000 --- a/pkgs/development/libraries/polkit-qt-1/polkit-install.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru -x '*~' polkit-qt-1-0.99.0-orig/PolkitQt-1Config.cmake.in polkit-qt-1-0.99.0/PolkitQt-1Config.cmake.in ---- polkit-qt-1-0.99.0-orig/PolkitQt-1Config.cmake.in 2010-12-08 18:22:28.000000000 +0100 -+++ polkit-qt-1-0.99.0/PolkitQt-1Config.cmake.in 2011-07-12 13:26:51.000000000 +0200 -@@ -15,7 +15,7 @@ - - set(POLKITQT-1_INCLUDE_DIR "@INCLUDE_INSTALL_DIR@/polkit-qt-1") - set(POLKITQT-1_LIB_DIR "@LIB_INSTALL_DIR@") --set(POLKITQT-1_POLICY_FILES_INSTALL_DIR "${POLKITQT-1_INSTALL_DIR}/share/polkit-1/actions") -+set(POLKITQT-1_POLICY_FILES_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions") - - # Compatibility - if(WIN32) |