summaryrefslogtreecommitdiffstats
path: root/pkgs/applications/editors/kdevelop5
diff options
context:
space:
mode:
authorAmbroz Bizjak <ambrop7@gmail.com>2016-10-15 07:52:42 +0200
committerAmbroz Bizjak <ambrop7@gmail.com>2016-10-30 18:50:55 +0100
commitde98c8d791fd18121dca226f86f43d2f24d3fa65 (patch)
treee860b19ab216ce6d8d4e08aeb2979c9c7b9aed73 /pkgs/applications/editors/kdevelop5
parent3be635b9b531b9e9cf07e0cd805e82a127cfdf6b (diff)
kdevelop: 5.0.0 -> 5.0.2
Diffstat (limited to 'pkgs/applications/editors/kdevelop5')
-rw-r--r--pkgs/applications/editors/kdevelop5/kdevelop.nix19
-rw-r--r--pkgs/applications/editors/kdevelop5/kdevplatform.nix6
2 files changed, 14 insertions, 11 deletions
diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix
index 845a02bebf6a..cf1d70350ba7 100644
--- a/pkgs/applications/editors/kdevelop5/kdevelop.nix
+++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix
@@ -1,16 +1,16 @@
{ stdenv, fetchurl, cmake, gettext, pkgconfig, extra-cmake-modules, makeQtWrapper
-, qtquickcontrols, qtwebkit
+, qtquickcontrols, qtwebkit, qttools
, kconfig, kdeclarative, kdoctools, kiconthemes, ki18n, kitemmodels, kitemviews
, kjobwidgets, kcmutils, kio, knewstuff, knotifyconfig, kparts, ktexteditor
-, threadweaver, kxmlgui, kwindowsystem
+, threadweaver, kxmlgui, kwindowsystem, grantlee
, plasma-framework, krunner, kdevplatform, kdevelop-pg-qt, shared_mime_info
-, libksysguard, llvmPackages
+, libksysguard, llvmPackages, makeWrapper
}:
let
pname = "kdevelop";
- version = "5.0";
- dirVersion = "5.0.0";
+ version = "5.0.2";
+ dirVersion = "5.0.2";
in
stdenv.mkDerivation rec {
@@ -18,22 +18,25 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://kde/stable/${pname}/${dirVersion}/src/${name}.tar.xz";
- sha256 = "5e034b8670f4ba13ccb2948c28efa0b54df346e85b648078698cca8974ea811c";
+ sha256 = "9b017901167723230dee8b565cdc7b0e61762415ffcc0a32708f04f7ab668666";
};
- nativeBuildInputs = [ cmake gettext pkgconfig extra-cmake-modules makeQtWrapper ];
+ nativeBuildInputs = [
+ cmake gettext pkgconfig extra-cmake-modules makeWrapper makeQtWrapper
+ ];
buildInputs = [
qtquickcontrols qtwebkit
kconfig kdeclarative kdoctools kiconthemes ki18n kitemmodels kitemviews
kjobwidgets kcmutils kio knewstuff knotifyconfig kparts ktexteditor
- threadweaver kxmlgui kwindowsystem plasma-framework krunner
+ threadweaver kxmlgui kwindowsystem grantlee plasma-framework krunner
kdevplatform kdevelop-pg-qt shared_mime_info libksysguard
llvmPackages.llvm llvmPackages.clang-unwrapped
];
postInstall = ''
wrapQtProgram "$out/bin/kdevelop"
+ wrapProgram "$out/bin/kdevelop!" --prefix PATH ":" "${qttools}/bin"
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/editors/kdevelop5/kdevplatform.nix b/pkgs/applications/editors/kdevelop5/kdevplatform.nix
index 52af0a4e05db..d8a7e7f2b9e0 100644
--- a/pkgs/applications/editors/kdevelop5/kdevplatform.nix
+++ b/pkgs/applications/editors/kdevelop5/kdevplatform.nix
@@ -6,8 +6,8 @@
let
pname = "kdevplatform";
- version = "5.0";
- dirVersion = "5.0.0";
+ version = "5.0.2";
+ dirVersion = "5.0.2";
in
stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://kde/stable/kdevelop/${dirVersion}/src/${name}.tar.xz";
- sha256 = "4085b355ab8d599d902afbc11027e1aefb22afe30d63ed54ea5fe02f24edfd10";
+ sha256 = "a7f311198bb72f5fee064d99055e8df39ecf4e9066fe5c0ff901ee8c24d960ec";
};
nativeBuildInputs = [ cmake gettext pkgconfig extra-cmake-modules makeQtWrapper ];