diff options
| author | joachifm <joachifm@users.noreply.github.com> | 2016-03-14 21:30:12 +0000 |
|---|---|---|
| committer | joachifm <joachifm@users.noreply.github.com> | 2016-03-14 21:30:12 +0000 |
| commit | 71655b0b6946ce98014767957161f93cd69b557d (patch) | |
| tree | 473097872b20c70ee38b11aa95b33ff35911780e /pkgs/development | |
| parent | b7c8085c30e176443de1798c3a78e6efbe3ccf62 (diff) | |
| parent | 1edb9b9558fba6026cf3c7dddb11fda71d4c740d (diff) | |
| download | nixlib-71655b0b6946ce98014767957161f93cd69b557d.tar nixlib-71655b0b6946ce98014767957161f93cd69b557d.tar.gz nixlib-71655b0b6946ce98014767957161f93cd69b557d.tar.bz2 nixlib-71655b0b6946ce98014767957161f93cd69b557d.tar.lz nixlib-71655b0b6946ce98014767957161f93cd69b557d.tar.xz nixlib-71655b0b6946ce98014767957161f93cd69b557d.tar.zst nixlib-71655b0b6946ce98014767957161f93cd69b557d.zip | |
Merge pull request #13843 from ambrop72/kdevelop-473
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") |