JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'kdevelop46' of git://github.com/ambrop72/nixpkgs

Browse Source 
kdevelop: Update to 4.6.
This commit is contained in:
Shea Levy 2014-03-19 18:11:35 -04:00
commit 506924c6c2
2 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/applications/editors/kdevelop/default.nix
View File

@ -1,28 +1,20 @@
{ stdenv, fetchurl, kdevplatform, cmake, pkgconfig, automoc4, shared_mime_info,
kdebase_workspace, gettext, perl, okteta }:
kdebase_workspace, gettext, perl, okteta, qjson }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
version = "4.3.1";
version = "4.6.0";
pname = "kdevelop";
src = fetchurl {
url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2";
sha256 = "0015hv39rqhyq1w6jw65lx7ls4l5pc3a2asvd5zsd65831vrfxxs";
url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
sha256 = "1ee9e7b8c46f575dd29d920cfd6284130f2e738a2e1f52dfd97b075fab2e4c73";
};
buildInputs = [ kdevplatform kdebase_workspace okteta ];
buildInputs = [ kdevplatform kdebase_workspace okteta qjson ];
nativeBuildInputs = [ cmake pkgconfig automoc4 shared_mime_info gettext perl ];
patches =
[ ( fetchurl {
url = https://git.reviewboard.kde.org/r/105211/diff/raw/;
name = "okteta-0.9.patch"; # fixes build with KDE-4.9.x
sha256 = "1mvqhw7jr1vi66l3jgam3slyfafcvwy4g3iapfi69dpfnzhmcxl0";
} )
];
NIX_CFLAGS_COMPILE = "-I${okteta}/include/KDE";
meta = with stdenv.lib; {

10
pkgs/development/libraries/kdevplatform/default.nix
View File

@ -1,16 +1,16 @@
{ stdenv, fetchurl, cmake, kdelibs, subversion, qt4, automoc4, perl, phonon,
gettext, pkgconfig, apr, aprutil, boost, qjson }:
gettext, pkgconfig, apr, aprutil, boost, qjson, grantlee }:
stdenv.mkDerivation rec {
name = "kdevplatform-1.3.1";
name = "kdevplatform-1.6.0";
src = fetchurl {
url = "mirror://kde/stable/kdevelop/4.3.1/src/${name}.tar.bz2";
sha256 = "1fiqwabw5ilhw1jwvvr743dym12y3kxrs3zlqahz57yncdsglcl6";
url = "mirror://kde/stable/kdevelop/4.6.0/src/${name}.tar.xz";
sha256 = "cdf7c88ca8860258f46e41d2107c826a307212fd041345bee54fbd70c9794f80";
};
propagatedBuildInputs = [ kdelibs qt4 phonon ];
buildInputs = [ apr aprutil subversion boost qjson ];
buildInputs = [ apr aprutil subversion boost qjson grantlee ];
nativeBuildInputs = [ cmake automoc4 gettext pkgconfig ];