polkit-qt-1: 0.112 -> 0.113 and drop the old qt4 version

This commit is contained in:
Peter Hoeg 2021-03-01 13:03:41 +08:00
parent 828a3fbc68
commit e7363192ef
5 changed files with 38 additions and 69 deletions

View File

@ -0,0 +1,37 @@
{ stdenv
, lib
, mkDerivation
, fetchurl
, cmake
, pkg-config
, polkit
, glib
, pcre
, libselinux
, libsepol
, util-linux
}:
mkDerivation rec {
pname = "polkit-qt-1";
version = "0.113.0";
src = fetchurl {
url = "mirror://kde/stable/${pname}/${pname}-${version}.tar.xz";
sha256 = "sha256-W4ZqKVTvEP+2YVbi/orQMhtVKKjfLkqRsC9QQc5VY6c=";
};
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [
glib
pcre
polkit
] ++ lib.optionals stdenv.isLinux [ libselinux libsepol util-linux ];
meta = with lib; {
description = "A Qt wrapper around PolKit";
maintainers = with maintainers; [ ttuegel ];
platforms = platforms.linux;
};
}

View File

@ -1,34 +0,0 @@
{ lib, stdenv, fetchurl, cmake, pkg-config, polkit, automoc4, glib, qt4 }:
with 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";
};
outputs = [ "out" "dev" ];
nativeBuildInputs = [ cmake pkg-config automoc4 ];
propagatedBuildInputs = [ polkit glib qt4 ];
postFixup =
''
for i in $dev/lib/cmake/*/*.cmake; do
echo "fixing $i"
substituteInPlace $i \
--replace "\''${PACKAGE_PREFIX_DIR}/lib" $out/lib
done
'';
meta = with lib; {
description = "A Qt wrapper around PolKit";
maintainers = [ maintainers.ttuegel ];
platforms = platforms.linux;
license = licenses.lgpl21;
};
}

View File

@ -1,32 +0,0 @@
{ lib, stdenv, fetchurl, cmake, pkg-config, polkit, glib, qtbase }:
with lib;
stdenv.mkDerivation {
name = "polkit-qt-1-qt5-0.112.0";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://kde/stable/apps/KDE4.x/admin/polkit-qt-1-0.112.0.tar.bz2";
sha256 = "1ip78x20hjqvm08kxhp6gb8hf6k5n6sxyx6kk2yvvq53djzh7yv7";
};
nativeBuildInputs = [ cmake pkg-config ];
propagatedBuildInputs = [ polkit glib qtbase ];
dontWrapQtApps = true;
postFixup = ''
# Fix library location in CMake module
sed -i "$dev/lib/cmake/PolkitQt5-1/PolkitQt5-1Config.cmake" \
-e "s,\\(set_and_check.POLKITQT-1_LIB_DIR\\).*$,\\1 \"''${!outputLib}/lib\"),"
'';
meta = {
description = "A Qt wrapper around PolKit";
maintainers = with lib.maintainers; [ ttuegel ];
platforms = with lib.platforms; linux;
};
}

View File

@ -16374,8 +16374,6 @@ in
polkit = callPackage ../development/libraries/polkit { };
polkit_qt4 = callPackage ../development/libraries/polkit-qt-1/qt-4.nix { };
poppler = callPackage ../development/libraries/poppler { lcms = lcms2; };
poppler_0_61 = callPackage ../development/libraries/poppler/0.61.nix { lcms = lcms2; };

View File

@ -127,7 +127,7 @@ in (kdeFrameworks // plasma5 // plasma5.thirdParty // kdeApplications // qt5 //
plasma-wayland-protocols = callPackage ../development/libraries/plasma-wayland-protocols { };
polkit-qt = callPackage ../development/libraries/polkit-qt-1/qt-5.nix { };
polkit-qt = callPackage ../development/libraries/polkit-qt-1 { };
poppler = callPackage ../development/libraries/poppler {
lcms = pkgs.lcms2;