summaryrefslogtreecommitdiffstats
path: root/pkgs/applications/graphics/krita
diff options
context:
space:
mode:
authorJörg Thalheim <joerg@thalheim.io>2017-06-25 10:18:01 +0100
committerJörg Thalheim <joerg@thalheim.io>2017-06-25 10:18:45 +0100
commitf506b723086e1739765d9065e468499eab3a2e54 (patch)
treebd6e490a0759fd5095c07e510efb51e6008f0e5f /pkgs/applications/graphics/krita
parentbc7d575c5234872bbd4cd024128919f075e8c1ec (diff)
krita: 3.1.3 -> 3.1.4
Diffstat (limited to 'pkgs/applications/graphics/krita')
-rw-r--r--pkgs/applications/graphics/krita/default.nix16
1 files changed, 11 insertions, 5 deletions
diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix
index 50720f854dbf..ccac9dd0ed19 100644
--- a/pkgs/applications/graphics/krita/default.nix
+++ b/pkgs/applications/graphics/krita/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, fetchurl, cmake, extra-cmake-modules
+{ mkDerivation, lib, fetchurl, fetchpatch, cmake, extra-cmake-modules
, karchive, kconfig, kwidgetsaddons, kcompletion, kcoreaddons
, kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem
, kio, kcrash
@@ -9,12 +9,11 @@
mkDerivation rec {
name = "krita-${version}";
- ver_min = "3.1.3";
- version = "${ver_min}";
+ version = "3.1.4";
src = fetchurl {
- url = "http://download.kde.org/stable/krita/${ver_min}/${name}.tar.gz";
- sha256 = "125js6c8aw4bqhs28pwnl3rbgqx5yx4zsklw7bfdhy3vf6lrysw1";
+ url = "http://download.kde.org/stable/krita/${version}/${name}.tar.gz";
+ sha256 = "1al27v17s70hihk2mcmz3l2g6rl9qzpxaifapdfpkyias6q3f63l";
};
nativeBuildInputs = [ cmake extra-cmake-modules ];
@@ -27,6 +26,13 @@ mkDerivation rec {
qtmultimedia qtx11extras
];
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/KDE/krita/commit/2f59d0d1.patch";
+ sha256 = "0sdlcjn6i3faln3c0aczw3pg4pvmccgszmy8n914mgsccrqrazlr";
+ })
+ ];
+
NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev}/include/OpenEXR" ];
meta = with lib; {