BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

kdevelop: 4.7.1 -> 4.7.3

Browse source
This commit is contained in:
Ambroz Bizjak 2016-03-11 21:45:19 +01:00
parent 329addf0b3
commit 1edb9b9558
4 changed files with 28 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/applications/editors/kdevelop/default.nix
View file

@ -3,12 +3,12 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
version = "4.7.1"; version = "4.7.3";
pname = "kdevelop"; pname = "kdevelop";
src = fetchurl { src = fetchurl {
url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2";
sha256 = "e3ad5377f53739a67216d37cda3f88c03f8fbb0c96e2a9ef4056df3c124e95c1"; sha256 = "9db388d1c8274da7d168c13db612c7e94ece7815757b945b0aa0371620a06b35";
}; };
buildInputs = [ kdevplatform kdebase_workspace okteta qjson ]; buildInputs = [ kdevplatform kdebase_workspace okteta qjson ];
@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
propagatedUserEnvPkgs = [ kdevplatform kate konsole kde_runtime oxygen_icons ]; propagatedUserEnvPkgs = [ kdevplatform kate konsole kde_runtime oxygen_icons ];
patches = [ ./gettext.patch ];
NIX_CFLAGS_COMPILE = "-I${okteta}/include/KDE"; NIX_CFLAGS_COMPILE = "-I${okteta}/include/KDE";
meta = with stdenv.lib; { meta = with stdenv.lib; {
@ -31,6 +33,6 @@ stdenv.mkDerivation rec {
programing languages. It is based on KDevPlatform, KDE and Qt programing languages. It is based on KDevPlatform, KDE and Qt
libraries and is under development since 1998. libraries and is under development since 1998.
''; '';
homepage = http://www.kdevelop.org; homepage = https://www.kdevelop.org;
}; };
} }

8
pkgs/applications/editors/kdevelop/gettext.patch Normal file
View file

@ -0,0 +1,8 @@
diff -urN kdevelop-4.7.3.orig/po/CMakeLists.txt kdevelop-4.7.3/po/CMakeLists.txt
--- kdevelop-4.7.3.orig/po/CMakeLists.txt 2016-03-04 23:29:09.411886565 +0100
+++ kdevelop-4.7.3/po/CMakeLists.txt 2016-03-04 23:28:35.108451713 +0100
@@ -1,3 +1,4 @@
+cmake_policy(SET CMP0002 OLD)
find_package(Gettext REQUIRED)
if (NOT GETTEXT_MSGMERGE_EXECUTABLE)
MESSAGE(FATAL_ERROR "Please install msgmerge binary")

15
pkgs/development/libraries/kdevplatform/default.nix
View file

@ -1,19 +1,15 @@
{ stdenv, fetchurl, fetchpatch, cmake, kdelibs, subversion, qt4, automoc4, phonon, { stdenv, fetchurl, cmake, kdelibs, subversion, qt4, automoc4, phonon,
gettext, pkgconfig, apr, aprutil, boost, qjson, grantlee }: gettext, pkgconfig, apr, aprutil, boost, qjson, grantlee }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "kdevplatform-1.7.1"; name = "kdevplatform-1.7.3";
src = fetchurl { src = fetchurl {
url = "mirror://kde/stable/kdevelop/4.7.1/src/${name}.tar.xz"; url = "mirror://kde/stable/kdevelop/4.7.3/src/${name}.tar.bz2";
sha256 = "dfd8953aec204f04bd949443781aa0f6d9d58c40f73027619a168bb4ffc4b1ac"; sha256 = "195134bde11672de38838f4b341ed28c58042374ca12beedacca9d30e6ab4a2b";
}; };
patches = [(fetchpatch { patches = [ ./gettext.patch ];
name = "svn-1.9.patch";
url = "https://git.reviewboard.kde.org/r/124783/diff/raw/";
sha256 = "1ixll5pvynb3l4znc65d82a5bj2s3c7c7is585s2wdpfzjgl5ay0";
})];
propagatedBuildInputs = [ kdelibs qt4 phonon ]; propagatedBuildInputs = [ kdelibs qt4 phonon ];
buildInputs = [ apr aprutil subversion boost qjson grantlee ]; buildInputs = [ apr aprutil subversion boost qjson grantlee ];
@ -31,5 +27,6 @@ stdenv.mkDerivation rec {
IDE-like programs. It is programing-language independent, and is planned IDE-like programs. It is programing-language independent, and is planned
to be used by programs like: KDevelop, Quanta, Kile, KTechLab ... etc." to be used by programs like: KDevelop, Quanta, Kile, KTechLab ... etc."
''; '';
homepage = https://www.kdevelop.org;
}; };
} }

8
pkgs/development/libraries/kdevplatform/gettext.patch Normal file
View file

@ -0,0 +1,8 @@
diff -urN kdevplatform-1.7.3.orig/po/CMakeLists.txt kdevplatform-1.7.3/po/CMakeLists.txt
--- kdevplatform-1.7.3.orig/po/CMakeLists.txt 2016-03-04 23:25:30.102112596 +0100
+++ kdevplatform-1.7.3/po/CMakeLists.txt 2016-03-04 23:26:06.242570024 +0100
@@ -1,3 +1,4 @@
+cmake_policy(SET CMP0002 OLD)
find_package(Gettext REQUIRED)
if (NOT GETTEXT_MSGMERGE_EXECUTABLE)
MESSAGE(FATAL_ERROR "Please install msgmerge binary")