diff options
| author | Thomas Tuegel <ttuegel@secure.mailbox.org> | 2017-02-14 13:00:27 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-14 13:00:27 -0600 |
| commit | c5c43802056ca8babe08d520a3ac9607c6f9f6ff (patch) | |
| tree | 0e68a37f559d789c288cbae0c2370564cf855a1c /pkgs/applications/graphics/digikam | |
| parent | 3be13889633df6413cea1f2fdeed34ecee01d598 (diff) | |
| parent | 4efd108e60ea56f13d3ff3c35a30432787a3a3d8 (diff) | |
| download | nixlib-c5c43802056ca8babe08d520a3ac9607c6f9f6ff.tar nixlib-c5c43802056ca8babe08d520a3ac9607c6f9f6ff.tar.gz nixlib-c5c43802056ca8babe08d520a3ac9607c6f9f6ff.tar.bz2 nixlib-c5c43802056ca8babe08d520a3ac9607c6f9f6ff.tar.lz nixlib-c5c43802056ca8babe08d520a3ac9607c6f9f6ff.tar.xz nixlib-c5c43802056ca8babe08d520a3ac9607c6f9f6ff.tar.zst nixlib-c5c43802056ca8babe08d520a3ac9607c6f9f6ff.zip | |
Merge pull request #21366 from sh01/digikam_patch_lensfun_0.3.2
digikam: Add patch to fix compilation against Lensfun 0.3.2
Diffstat (limited to 'pkgs/applications/graphics/digikam')
| -rw-r--r-- | pkgs/applications/graphics/digikam/default.nix | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index f38e402ce929..11cc6c9c8089 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, automoc4, boost, shared_desktop_ontologies, cmake -, eigen, lcms, gettext, jasper, kdelibs, kdepimlibs, lensfun +{ stdenv, fetchurl, fetchpatch, automoc4, boost, shared_desktop_ontologies +, cmake, eigen, lcms, gettext, jasper, kdelibs, kdepimlibs, lensfun , libgphoto2, libjpeg, libkdcraw, libkexiv2, libkipi, libpgf, libtiff , libusb1, liblqr1, marble, mysql, opencv, perl, phonon, pkgconfig , qca2, qimageblitz, qjson, qt4, soprano @@ -36,6 +36,16 @@ let sha256 = "081ldsaf3frf5khznjd3sxkjmi4dyp6w6nqnc2a0agkk0kxkl10m"; }; + patches = [ + (fetchpatch { + # Fix compilation against Lensfun 0.3.2 + url = "http://cgit.kde.org/digikam.git/patch/?id=0f159981176faa6da701f112bfe557b79804d468"; + sha256 = "1c8bg7s84vg4v620gbs16cjcbpml749018gy5dpvfacx5vl24wza"; + }) + ]; + + patchFlags = ["-p1" "-dcore"]; + nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ] ++ [ |