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

Merge remote-tracking branch 'upstream/master' into gcc-8

Browse Source
This commit is contained in:
Robin Gloster
2019-08-25 18:55:46 +02:00
parent 45d6ccea33 48191315aa
commit 616b8343c4
5048 changed files with 266048 additions and 268080 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/libextractor/default.nix
+10 -2
View File
@@ -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'..."