Author: urkud
Date: Mon Aug 15 23:39:20 2011
New Revision: 28604
URL: https://svn.nixos.org/websvn/nix/?rev=28604&sc=1
Log:
Upgrade kdevelop and kdevplatform
Modified:
nixpkgs/trunk/pkgs/applications/editors/kdevelop/default.nix
nixpkgs/trunk/pkgs/development/libraries/kdevplatform/default.nix
Modified: nixpkgs/trunk/pkgs/applications/editors/kdevelop/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/editors/kdevelop/default.nix Mon Aug
15 23:39:11 2011 (r28603)
+++ nixpkgs/trunk/pkgs/applications/editors/kdevelop/default.nix Mon Aug
15 23:39:20 2011 (r28604)
@@ -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 ];
Modified: nixpkgs/trunk/pkgs/development/libraries/kdevplatform/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/kdevplatform/default.nix Mon Aug
15 23:39:11 2011 (r28603)
+++ nixpkgs/trunk/pkgs/development/libraries/kdevplatform/default.nix Mon Aug
15 23:39:20 2011 (r28604)
@@ -1,16 +1,19 @@
{ stdenv, fetchurl, cmake, kdelibs, subversion, qt4, automoc4, perl, phonon,
- gettext, pkgconfig, apr, aprutil, boost }:
+ gettext, pkgconfig, apr, aprutil, boost, qjson }:
stdenv.mkDerivation rec {
- name = "kdevplatform-1.0.2";
+ name = "kdevplatform-1.2.3";
src = fetchurl {
- url = "mirror://kde/stable/kdevelop/4.0.2/src/${name}.tar.bz2";
- sha256 = "0yn4v3jx1dks84nvi7s40a1pmnvipqx5hlbvbmdgqhhpqik5y9qg";
+ url = "mirror://kde/stable/kdevelop/4.2.3/src/${name}.tar.bz2";
+ sha256 = "1h55lh7kkb8d9qgf4yyzmdwn7vq8l49lzlq92jccz7p79lxb2s08";
};
propagatedBuildInputs = [ kdelibs subversion qt4 phonon ];
- buildInputs = [ cmake automoc4 perl gettext pkgconfig apr aprutil boost
stdenv.gcc.libc ];
+ buildInputs =
+ [ cmake automoc4 perl gettext pkgconfig apr aprutil boost
+ stdenv.gcc.libc qjson
+ ];
meta = with stdenv.lib; {
maintainers = [ maintainers.urkud ];
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
