diff options
Diffstat (limited to 'pkgs/applications/editors/kdevelop5/kdevelop.nix')
| -rw-r--r-- | pkgs/applications/editors/kdevelop5/kdevelop.nix | 24 |
1 files changed, 13 insertions, 11 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" |