public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #21366 from sh01/digikam_patch_lensfun_0.3.2 

digikam: Add patch to fix compilation against Lensfun 0.3.2
This commit is contained in:
Thomas Tuegel 2017-02-14 13:00:27 -06:00 committed by GitHub
parent 3be1388963 4efd108e60
commit c5c4380205
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/applications/graphics/digikam/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, automoc4, boost, shared_desktop_ontologies, cmake { stdenv, fetchurl, fetchpatch, automoc4, boost, shared_desktop_ontologies
, eigen, lcms, gettext, jasper, kdelibs, kdepimlibs, lensfun , cmake, eigen, lcms, gettext, jasper, kdelibs, kdepimlibs, lensfun
, libgphoto2, libjpeg, libkdcraw, libkexiv2, libkipi, libpgf, libtiff , libgphoto2, libjpeg, libkdcraw, libkexiv2, libkipi, libpgf, libtiff
, libusb1, liblqr1, marble, mysql, opencv, perl, phonon, pkgconfig , libusb1, liblqr1, marble, mysql, opencv, perl, phonon, pkgconfig
, qca2, qimageblitz, qjson, qt4, soprano , qca2, qimageblitz, qjson, qt4, soprano
@ -36,6 +36,16 @@ let
sha256 = "081ldsaf3frf5khznjd3sxkjmi4dyp6w6nqnc2a0agkk0kxkl10m"; 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 = [ nativeBuildInputs = [
automoc4 cmake gettext perl pkgconfig automoc4 cmake gettext perl pkgconfig
] ++ [ ] ++ [