diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-02-15 08:41:35 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-02-15 08:41:35 +0100 |
| commit | 35b2159671fa6c514bff1fb419833cd41ea07dee (patch) | |
| tree | 6ec1b6cb14a64e151496b37646e840fb1accd972 /pkgs/applications/graphics/digikam/default.nix | |
| parent | f228ea5215c4db3ab9607a07a371f39443eea371 (diff) | |
| parent | b1bfe9d3db71de1aa9524ec76b188cfe4cd7dd3e (diff) | |
| download | nixlib-35b2159671fa6c514bff1fb419833cd41ea07dee.tar nixlib-35b2159671fa6c514bff1fb419833cd41ea07dee.tar.gz nixlib-35b2159671fa6c514bff1fb419833cd41ea07dee.tar.bz2 nixlib-35b2159671fa6c514bff1fb419833cd41ea07dee.tar.lz nixlib-35b2159671fa6c514bff1fb419833cd41ea07dee.tar.xz nixlib-35b2159671fa6c514bff1fb419833cd41ea07dee.tar.zst nixlib-35b2159671fa6c514bff1fb419833cd41ea07dee.zip | |
Merge branch 'master' into staging
Over 11k rebuilds on master.
Diffstat (limited to 'pkgs/applications/graphics/digikam/default.nix')
| -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 f6ce07eb1645..9a9c0ff1d7f7 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 ] ++ [ |