diff options
| author | Robin Gloster <mail@glob.in> | 2019-08-25 18:55:46 +0200 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2019-08-25 18:55:46 +0200 |
| commit | 616b8343c4c384f651f51d8c9b8e96239e1113d0 (patch) | |
| tree | c6894ea5e950e373bcf8c8e8948fb2a7d4716565 /pkgs/development/libraries/libextractor | |
| parent | 45d6ccea3357c65135b985f2eebf88020ca6461e (diff) | |
| parent | 48191315aa2e34643203dbfc5ae8bd84c1cafe54 (diff) | |
Merge remote-tracking branch 'upstream/master' into gcc-8
Diffstat (limited to 'pkgs/development/libraries/libextractor')
| -rw-r--r-- | pkgs/development/libraries/libextractor/default.nix | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix index d5c720e0a1fd..8fd01dbd506a 100644 --- a/pkgs/development/libraries/libextractor/default.nix +++ b/pkgs/development/libraries/libextractor/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, libtool, gettext, zlib, bzip2, flac, libvorbis -, exiv2, libgsf, rpm, pkgconfig +, exiv2, libgsf, rpm, pkgconfig, fetchpatch , gtkSupport ? true, glib ? null, gtk3 ? null , videoSupport ? true, ffmpeg ? null, libmpeg2 ? null}: @@ -14,7 +14,15 @@ stdenv.mkDerivation rec { sha256 = "1zz2zvikvfibxnk1va3kgzs7djsmiqy7bmk8y01vbsf54ryjb3zh"; }; - patches = [ ./fix-gcc8-build.patch ]; + patches = [ + ./fix-gcc8-build.patch + # Fixes build with exiv2 0.27 + (fetchpatch { + name = "libextractor-exiv2-0.27.patch"; + url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/libextractor-exiv2-0.27.patch?h=packages/libextractor&id=4dc53f7fc69210ae571285dface108ed65d8ee53"; + sha256 = "0w4gc1q1m1yxsd4hv105nblmif465nw3g5nxzldy0x2rl9mdncg6"; + }) + ]; preConfigure = '' echo "patching installation directory in \`extractor.c'..." |