diff options
| author | Evgeny Egorochkin <phreedom@yandex.ru> | 2013-05-07 17:09:47 +0300 |
|---|---|---|
| committer | Evgeny Egorochkin <phreedom@yandex.ru> | 2013-05-07 17:23:46 +0300 |
| commit | d32fafc9e444b295f619a154db3540c352db6d9b (patch) | |
| tree | 6c1ec7558df0da64a9dc0f23ee812f98bbb07790 | |
| parent | 2e77679b0bfddb64b54703bfeaac455979ff0b2c (diff) | |
| download | nixpkgs-d32fafc9e444b295f619a154db3540c352db6d9b.tar nixpkgs-d32fafc9e444b295f619a154db3540c352db6d9b.tar.gz nixpkgs-d32fafc9e444b295f619a154db3540c352db6d9b.tar.bz2 nixpkgs-d32fafc9e444b295f619a154db3540c352db6d9b.tar.lz nixpkgs-d32fafc9e444b295f619a154db3540c352db6d9b.tar.xz nixpkgs-d32fafc9e444b295f619a154db3540c352db6d9b.tar.zst nixpkgs-d32fafc9e444b295f619a154db3540c352db6d9b.zip | |
Calligra: fix build with KDE 4.10
| -rw-r--r-- | pkgs/applications/office/calligra/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/office/calligra/fix-kde4.10-build.patch | 36 |
2 files changed, 39 insertions, 1 deletions
diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index 0769f324c15..da2d166fc86 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake perl pkgconfig ]; + patches = [ ./fix-kde4.10-build.patch ]; + buildInputs = [ kdelibs attica zlib libpng boost mesa kdepimlibs createresources eigen qca2 exiv2 soprano marble lcms2 fontconfig freetype sqlite icu libwpd libwpg popplerQt4 libkdcraw libxslt fftw glew gsl @@ -21,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "A Qt/KDE office suite, formely known as koffice"; homepage = http://calligra.org; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = with stdenv.lib.maintainers; [ urkud phreedom ]; inherit (kdelibs.meta) platforms; }; } diff --git a/pkgs/applications/office/calligra/fix-kde4.10-build.patch b/pkgs/applications/office/calligra/fix-kde4.10-build.patch new file mode 100644 index 00000000000..e41d6a28f9d --- /dev/null +++ b/pkgs/applications/office/calligra/fix-kde4.10-build.patch @@ -0,0 +1,36 @@ +From: Andre Woebbeking <Woebbeking@kde.org> +Date: Sun, 13 Jan 2013 15:10:38 +0000 +Subject: compile with kdelibs 4.10 (tests are enabled by default) +X-Git-Url: http://quickgit.kde.org/?p=calligra.git&a=commitdiff&h=39fdda6757cbbb35480dec98eac419eb1879cb31 +--- +compile with kdelibs 4.10 (tests are enabled by default) +--- + + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -96,11 +96,6 @@ + set(SHOULD_BUILD_ACTIVE FALSE) + ENDIF() + +-if(KDE4_BUILD_TESTS) +- # only with this definition will the FOO_TEST_EXPORT macro do something +- add_definitions(-DCOMPILING_TESTS) +-endif(KDE4_BUILD_TESTS) +- + ######################## + ######################### + ## Look for KDE and Qt ## +@@ -146,6 +141,11 @@ + endif(NOT ${KDE_VERSION} VERSION_GREATER 4.6.4) + + macro_ensure_out_of_source_build("Compiling Calligra inside the source directory is not possible. Please refer to the build instruction http://community.kde.org/Calligra/Building/Building_Calligra") ++ ++if(KDE4_BUILD_TESTS) ++ # only with this definition will the FOO_TEST_EXPORT macro do something ++ add_definitions(-DCOMPILING_TESTS) ++endif(KDE4_BUILD_TESTS) + + ########################### + ############################ + |