diff options
| author | Robert Helgesson <robert@rycee.net> | 2017-03-04 20:38:09 +0100 |
|---|---|---|
| committer | Graham Christensen <graham@grahamc.com> | 2017-03-06 17:41:16 -0500 |
| commit | 747b62f909c16f951b7b94624f6494ab861d67ef (patch) | |
| tree | 14d21d4d49c070f33740e8a0dbb8045816f8e65e | |
| parent | 0705346de46b0b60b612b2e88cc7291b7050ab23 (diff) | |
| download | nixpkgs-747b62f909c16f951b7b94624f6494ab861d67ef.tar nixpkgs-747b62f909c16f951b7b94624f6494ab861d67ef.tar.gz nixpkgs-747b62f909c16f951b7b94624f6494ab861d67ef.tar.bz2 nixpkgs-747b62f909c16f951b7b94624f6494ab861d67ef.tar.lz nixpkgs-747b62f909c16f951b7b94624f6494ab861d67ef.tar.xz nixpkgs-747b62f909c16f951b7b94624f6494ab861d67ef.tar.zst nixpkgs-747b62f909c16f951b7b94624f6494ab861d67ef.zip | |
photivo: fix build with lensfun >= 0.3
| -rw-r--r-- | pkgs/applications/graphics/photivo/default.nix | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/applications/graphics/photivo/default.nix b/pkgs/applications/graphics/photivo/default.nix index d84363df899..69bc36dea61 100644 --- a/pkgs/applications/graphics/photivo/default.nix +++ b/pkgs/applications/graphics/photivo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchhg, cmake, qt4, fftw, graphicsmagick_q16, +{ stdenv, fetchhg, fetchpatch, cmake, qt4, fftw, graphicsmagick_q16, lcms2, lensfun, pkgconfig, libjpeg, exiv2, liblqr1 }: stdenv.mkDerivation rec { @@ -10,6 +10,16 @@ stdenv.mkDerivation rec { sha256 = "0f6y18k7db2ci6xn664zcwm1g1k04sdv7gg1yd5jk41bndjb7z8h"; }; + patches = [ + # Patch fixing build with lensfun >= 0.3, taken from + # https://www.linuxquestions.org/questions/slackware-14/photivo-4175530230/#post5296578 + (fetchpatch { + url = "https://www.linuxquestions.org/questions/attachment.php?attachmentid=17287&d=1420577220"; + name = "lensfun-0.3.patch"; + sha256 = "0ys45x4r4bjjlx0zpd5d56rgjz7k8gxili4r4k8zx3zfka4a3zwv"; + }) + ]; + postPatch = '' # kinda icky sed -e '/("@INSTALL@")/d' \ -e s,@INSTALL@,$out/share/photivo, \ |