diff options
| author | Ambroz Bizjak <ambrop7@gmail.com> | 2016-03-11 21:45:19 +0100 |
|---|---|---|
| committer | Ambroz Bizjak <ambrop7@gmail.com> | 2016-03-12 16:30:41 +0100 |
| commit | 1edb9b9558fba6026cf3c7dddb11fda71d4c740d (patch) | |
| tree | e376b765d296ae627fb8cd996344a57a94b05287 /pkgs/development | |
| parent | 329addf0b3e4c58f258031757ec110f0e1fdce23 (diff) | |
| download | nixlib-1edb9b9558fba6026cf3c7dddb11fda71d4c740d.tar nixlib-1edb9b9558fba6026cf3c7dddb11fda71d4c740d.tar.gz nixlib-1edb9b9558fba6026cf3c7dddb11fda71d4c740d.tar.bz2 nixlib-1edb9b9558fba6026cf3c7dddb11fda71d4c740d.tar.lz nixlib-1edb9b9558fba6026cf3c7dddb11fda71d4c740d.tar.xz nixlib-1edb9b9558fba6026cf3c7dddb11fda71d4c740d.tar.zst nixlib-1edb9b9558fba6026cf3c7dddb11fda71d4c740d.zip | |
kdevelop: 4.7.1 -> 4.7.3
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/kdevplatform/default.nix | 15 | ||||
| -rw-r--r-- | pkgs/development/libraries/kdevplatform/gettext.patch | 8 |
2 files changed, 14 insertions, 9 deletions
diff --git a/pkgs/development/libraries/kdevplatform/default.nix b/pkgs/development/libraries/kdevplatform/default.nix index 8398f2d7db4d..44e1a1f63adb 100644 --- a/pkgs/development/libraries/kdevplatform/default.nix +++ b/pkgs/development/libraries/kdevplatform/default.nix @@ -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 }: stdenv.mkDerivation rec { - name = "kdevplatform-1.7.1"; + name = "kdevplatform-1.7.3"; src = fetchurl { - url = "mirror://kde/stable/kdevelop/4.7.1/src/${name}.tar.xz"; - sha256 = "dfd8953aec204f04bd949443781aa0f6d9d58c40f73027619a168bb4ffc4b1ac"; + url = "mirror://kde/stable/kdevelop/4.7.3/src/${name}.tar.bz2"; + sha256 = "195134bde11672de38838f4b341ed28c58042374ca12beedacca9d30e6ab4a2b"; }; - patches = [(fetchpatch { - name = "svn-1.9.patch"; - url = "https://git.reviewboard.kde.org/r/124783/diff/raw/"; - sha256 = "1ixll5pvynb3l4znc65d82a5bj2s3c7c7is585s2wdpfzjgl5ay0"; - })]; + patches = [ ./gettext.patch ]; propagatedBuildInputs = [ kdelibs qt4 phonon ]; 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 to be used by programs like: KDevelop, Quanta, Kile, KTechLab ... etc." ''; + homepage = https://www.kdevelop.org; }; } diff --git a/pkgs/development/libraries/kdevplatform/gettext.patch b/pkgs/development/libraries/kdevplatform/gettext.patch new file mode 100644 index 000000000000..733a542e0c8b --- /dev/null +++ b/pkgs/development/libraries/kdevplatform/gettext.patch @@ -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") |