kdevelop: 5.1.2 -> 5.2.4

5 files changed, 29 insertions, 58 deletions

diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix
index 41d1a6262ed5..f0ac79e2d22c 100644
--- a/pkgs/applications/editors/kdevelop5/kdevelop.nix
+++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix
@@ -1,23 +1,23 @@
 { mkDerivation, lib, fetchurl, cmake, gettext, pkgconfig, extra-cmake-modules
-, qtquickcontrols, qtwebkit, qttools, kde-cli-tools
+, qtquickcontrols, qtwebkit, qttools, kde-cli-tools, qtbase
 , kconfig, kdeclarative, kdoctools, kiconthemes, ki18n, kitemmodels, kitemviews
 , kjobwidgets, kcmutils, kio, knewstuff, knotifyconfig, kparts, ktexteditor
 , threadweaver, kxmlgui, kwindowsystem, grantlee, kcrash, karchive, kguiaddons
-, plasma-framework, krunner, kdevplatform, kdevelop-pg-qt, shared-mime-info
-, libksysguard, konsole, llvmPackages, makeWrapper
+, plasma-framework, krunner, kdevelop-pg-qt, shared-mime-info, libkomparediff2
+, libksysguard, konsole, llvmPackages, makeWrapper, kpurpose, boost
 }:
 
 let
   pname = "kdevelop";
-  version = "5.1.2";
-
+  version = "5.2.4";
+  qtVersion = "5.${lib.versions.minor qtbase.version}";
 in
 mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
-    sha256 = "af54e807847d145fe5f3eb55962ed0d22e6363c2bc6c32167e51ca4823c00ac7";
+    sha256 = "1jbks7nh9rybz4kg152l39hfj2x0p6mjins8x9mz03bbv8jf8gic";
   };
 
   nativeBuildInputs = [
@@ -30,20 +30,22 @@ mkDerivation rec {
   ];
 
   propagatedBuildInputs = [
-    qtquickcontrols qtwebkit
+    qtquickcontrols qtwebkit boost libkomparediff2
     kconfig kdeclarative kdoctools kiconthemes ki18n kitemmodels kitemviews
     kjobwidgets kcmutils kio knewstuff knotifyconfig kparts ktexteditor
     threadweaver kxmlgui kwindowsystem grantlee plasma-framework krunner
-    kdevplatform shared-mime-info libksysguard konsole kcrash karchive kguiaddons
+    shared-mime-info libksysguard konsole kcrash karchive kguiaddons kpurpose
   ];
 
   postInstall = ''
     # The kdevelop! script (shell environment) needs qdbus and kioclient5 in PATH.
-    wrapProgram "$out/bin/kdevelop!" --prefix PATH ":" "${lib.makeBinPath [ qttools kde-cli-tools ]}"
+    wrapProgram "$out/bin/kdevelop!" \
+      --prefix PATH ":" "${lib.makeBinPath [ qttools kde-cli-tools ]}"
+
+    wrapProgram "$out/bin/kdevelop" \
+      --prefix QT_PLUGIN_PATH : $out/lib/qt-${qtVersion}/plugins
 
     # Fix the (now wrapped) kdevelop! to find things in right places:
-    # - Make KDEV_BASEDIR point to bin directory of kdevplatform.
-    kdev_fixup_sed="s|^export KDEV_BASEDIR=.*$|export KDEV_BASEDIR=${kdevplatform}/bin|"
     # - Fixup the one use where KDEV_BASEDIR is assumed to contain kdevelop.
     kdev_fixup_sed+=";s|\\\$KDEV_BASEDIR/kdevelop|$out/bin/kdevelop|"
     sed -E -i "$kdev_fixup_sed" "$out/bin/.kdevelop!-wrapped"
diff --git a/pkgs/applications/editors/kdevelop5/kdevplatform.nix b/pkgs/applications/editors/kdevelop5/kdevplatform.nix
deleted file mode 100644
index 88164c2c4585..000000000000
--- a/pkgs/applications/editors/kdevelop5/kdevplatform.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ stdenv, fetchurl, cmake, gettext, pkgconfig, extra-cmake-modules
-, boost, subversion, apr, aprutil, kwindowsystem
-, qtscript, qtwebkit, grantlee, karchive, kconfig, kcoreaddons, kguiaddons, kiconthemes, ki18n
-, kitemmodels, kitemviews, kio, kparts, sonnet, kcmutils, knewstuff, knotifications
-, knotifyconfig, ktexteditor, threadweaver, kdeclarative, libkomparediff2 }:
-
-let
-  pname = "kdevplatform";
-  version = "5.1.2";
-
-in
-stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
-
-  src = fetchurl {
-    url = "mirror://kde/stable/kdevelop/${version}/src/${name}.tar.xz";
-    sha256 = "e622ddad552a678baaf1166d5cbdc5fd1192d2324300c52ef2d25f1c6778664a";
-  };
-
-  nativeBuildInputs = [ cmake gettext pkgconfig extra-cmake-modules ];
-
-  buildInputs = [
-    boost subversion apr aprutil kwindowsystem
-    qtscript qtwebkit grantlee karchive kconfig kcoreaddons kguiaddons kiconthemes
-    ki18n kitemmodels kitemviews kio kparts sonnet kcmutils knewstuff
-    knotifications knotifyconfig ktexteditor threadweaver kdeclarative
-    libkomparediff2
-  ];
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    maintainers = [ maintainers.ambrop72 ];
-    platforms = platforms.linux;
-    description = "KDE libraries for IDE-like programs";
-    longDescription = ''
-      A free, opensource set of libraries that can be used as a foundation for
-      IDE-like programs. It is programing-language independent, and is planned
-      to be used by programs like: KDevelop, Quanta, Kile, KTechLab ... etc."
-    '';
-    homepage = https://www.kdevelop.org;
-    license = with stdenv.lib.licenses; [ gpl2Plus lgpl2Plus ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix
index d780fc30a4c2..ea8f30f0bba2 100644
--- a/pkgs/development/libraries/kde-frameworks/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/default.nix
@@ -173,6 +173,7 @@ let
       kxmlgui = callPackage ./kxmlgui.nix {};
       kxmlrpcclient = callPackage ./kxmlrpcclient.nix {};
       plasma-framework = callPackage ./plasma-framework.nix {};
+      kpurpose = callPackage ./purpose.nix {};
 
     # TIER 4
       frameworkintegration = callPackage ./frameworkintegration.nix {};
diff --git a/pkgs/development/libraries/kde-frameworks/purpose.nix b/pkgs/development/libraries/kde-frameworks/purpose.nix
new file mode 100644
index 000000000000..147c4123a105
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks/purpose.nix
@@ -0,0 +1,14 @@
+{
+  mkDerivation, lib, extra-cmake-modules, qtbase
+, qtdeclarative, kconfig, kcoreaddons, ki18n, kio
+}:
+
+mkDerivation {
+  name = "purpose";
+  meta = { maintainers = [ lib.maintainers.bkchr ]; };
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [
+    qtbase qtdeclarative kconfig kcoreaddons 
+    ki18n kio
+  ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ad0996eba146..0613481b3914 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11578,7 +11578,7 @@ with pkgs;
       kservice ktexteditor ktextwidgets kunitconversion kwallet kwayland
       kwidgetsaddons kwindowsystem kxmlgui kxmlrpcclient modemmanager-qt
       networkmanager-qt plasma-framework prison solid sonnet syntax-highlighting
-      threadweaver kirigami2 kholidays;
+      threadweaver kirigami2 kholidays kpurpose;
 
     ### KDE PLASMA 5
 
@@ -16956,8 +16956,6 @@ with pkgs;
     llvmPackages = llvmPackages_38;
   };
 
-  kdevplatform = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevplatform.nix { };
-
   keepnote = callPackage ../applications/office/keepnote { };
 
   kega-fusion = pkgsi686Linux.callPackage ../misc/emulators/kega-fusion { };