kphotoalbum: 5.11.0 -> 6.0.1

Author: peterhoeg

pkgs/applications/graphics/kphotoalbum/default.nix renamed to pkgs/by-name/kp/kphotoalbum/package.nix

@@ -1,60 +1,45 @@
 {
-  mkDerivation,
-  fetchpatch,
+  stdenv,
   fetchurl,
   lib,
   extra-cmake-modules,
-  kdoctools,
-  wrapGAppsHook3,
   exiv2,
   ffmpeg,
-  libkdcraw,
-  phonon,
   libvlc,
-  kconfig,
-  kiconthemes,
-  kio,
-  kinit,
-  kpurpose,
+  kdePackages,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "kphotoalbum";
-  version = "5.11.0";
+  version = "6.0.1";
 
   src = fetchurl {
-    url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz";
-    hash = "sha256-NWtOIHJXtc8PlltYbbp2YwDf/3QI3MdHNDX7WVQMig4=";
+    url = "mirror://kde/stable/kphotoalbum/${finalAttrs.version}/kphotoalbum-${finalAttrs.version}.tar.xz";
+    hash = "sha256-LLsQ66wKDg77nZUIxjcfzvC3AwLOtojuuDgkJm2dsww=";
   };
 
-  # Fix build against exiv2 0.28.1
-  patches = [
-    (fetchpatch {
-      url = "https://invent.kde.org/graphics/kphotoalbum/-/commit/1ceb1ae37f3f95aa290b0846969af4b26f616760.patch";
-      hash = "sha256-SfBJHyJZcysvemc/F09GPczBjcofxGomgjJ814PSU+c=";
-    })
-  ];
+  env.LANG = "C.UTF-8";
 
-  # not sure if we really need phonon when we have vlc, but on KDE it's bound to
-  # be on the system anyway, so there is no real harm including it
   buildInputs = [
+    kdePackages.qtbase
     exiv2
-    phonon
     libvlc
   ];
 
   nativeBuildInputs = [
     extra-cmake-modules
-    kdoctools
-    wrapGAppsHook3
+    kdePackages.wrapQtAppsHook
   ];
 
-  propagatedBuildInputs = [
+  # not sure if we really need phonon when we have vlc, but on KDE it's bound to
+  # be on the system anyway, so there is no real harm including it
+  propagatedBuildInputs = with kdePackages; [
     kconfig
     kiconthemes
     kio
-    kinit
-    kpurpose
+    kxmlgui
+    phonon
+    purpose
     libkdcraw
   ];
 
@@ -67,6 +52,6 @@ mkDerivation rec {
     homepage = "https://www.kphotoalbum.org/";
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ peterhoeg ];
-    inherit (kconfig.meta) platforms;
+    inherit (kdePackages.kconfig.meta) platforms;
   };
-}
+})

pkgs/top-level/all-packages.nix

@@ -3884,8 +3884,6 @@ with pkgs;
 
   kio-fuse = libsForQt5.callPackage ../tools/filesystems/kio-fuse { };
 
-  kphotoalbum = libsForQt5.callPackage ../applications/graphics/kphotoalbum { };
-
   krename = libsForQt5.callPackage ../applications/misc/krename { };
 
   krunner-pass = libsForQt5.callPackage ../tools/security/krunner-pass { };