diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2011-08-15 23:39:20 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2011-08-15 23:39:20 +0000 |
commit | 31ab846d05ff1e7b5a9ff5bd43f1e2e7e57787fd (patch) | |
tree | 3be890e99a6969392a4826452c1ff95e55ce3c56 /pkgs/applications/editors/kdevelop | |
parent | a660093a4d045b29b5c7edd18945f0b952e7422b (diff) |
Upgrade kdevelop and kdevplatform
svn path=/nixpkgs/trunk/; revision=28604
Diffstat (limited to 'pkgs/applications/editors/kdevelop')
-rw-r--r-- | pkgs/applications/editors/kdevelop/default.nix | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/applications/editors/kdevelop/default.nix b/pkgs/applications/editors/kdevelop/default.nix index 1b72f8f0b7fb8..e5b749c379470 100644 --- a/pkgs/applications/editors/kdevelop/default.nix +++ b/pkgs/applications/editors/kdevelop/default.nix @@ -1,18 +1,23 @@ { stdenv, fetchurl, kdevplatform, cmake, pkgconfig, automoc4, shared_mime_info, - kdebase_workspace, gettext, perl }: + kdebase_workspace, gettext, perl, kdeutils, kdesdk }: +let + okteta = if kdeutils ? okteta then kdeutils.okteta else kdesdk.okteta; +in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "4.0.2"; + version = "4.2.3"; pname = "kdevelop"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2"; - sha256 = "1y8ydx0fcmsab31qf5id5r5fcmp3j2l8mibvbbjfy66xgxarmnpc"; + sha256 = "0ay3d2s5442pvdsx9lyfzb986kh6848qhbls9ff982f0glzqdcya"; }; buildInputs = [ kdevplatform cmake pkgconfig automoc4 shared_mime_info - kdebase_workspace gettext stdenv.gcc.libc perl ]; + kdebase_workspace gettext stdenv.gcc.libc perl okteta ]; + + NIX_CFLAGS_COMPILE = "-I${okteta}/include/KDE"; meta = with stdenv.lib; { maintainers = [ maintainers.urkud ]; |