diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2019-01-11 06:47:24 +0100 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2019-06-17 07:06:01 +0200 |
| commit | 64d3bf633861eb9d2e581d140ea30402d3852a7d (patch) | |
| tree | 83e200d2661c2e70c2598362339e2aebaa9d20d6 /pkgs/development/libraries/libextractor | |
| parent | b5fa934872c85cb03f7cb813989470b0d05b21bf (diff) | |
| download | nixpkgs-64d3bf633861eb9d2e581d140ea30402d3852a7d.tar nixpkgs-64d3bf633861eb9d2e581d140ea30402d3852a7d.tar.gz nixpkgs-64d3bf633861eb9d2e581d140ea30402d3852a7d.tar.bz2 nixpkgs-64d3bf633861eb9d2e581d140ea30402d3852a7d.tar.lz nixpkgs-64d3bf633861eb9d2e581d140ea30402d3852a7d.tar.xz nixpkgs-64d3bf633861eb9d2e581d140ea30402d3852a7d.tar.zst nixpkgs-64d3bf633861eb9d2e581d140ea30402d3852a7d.zip | |
libextractor: fix build with gcc8
Diffstat (limited to 'pkgs/development/libraries/libextractor')
| -rw-r--r-- | pkgs/development/libraries/libextractor/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/libextractor/fix-gcc8-build.patch | 16 |
2 files changed, 18 insertions, 0 deletions
diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix index bc371423e43..d5c720e0a1f 100644 --- a/pkgs/development/libraries/libextractor/default.nix +++ b/pkgs/development/libraries/libextractor/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { sha256 = "1zz2zvikvfibxnk1va3kgzs7djsmiqy7bmk8y01vbsf54ryjb3zh"; }; + patches = [ ./fix-gcc8-build.patch ]; + preConfigure = '' echo "patching installation directory in \`extractor.c'..." sed -i "src/main/extractor.c" \ diff --git a/pkgs/development/libraries/libextractor/fix-gcc8-build.patch b/pkgs/development/libraries/libextractor/fix-gcc8-build.patch new file mode 100644 index 00000000000..e04d09be899 --- /dev/null +++ b/pkgs/development/libraries/libextractor/fix-gcc8-build.patch @@ -0,0 +1,16 @@ +diff --git a/src/plugins/ole2_extractor.c b/src/plugins/ole2_extractor.c +index 072ffc5..a105840 100644 +--- a/src/plugins/ole2_extractor.c ++++ b/src/plugins/ole2_extractor.c +@@ -345,9 +345,8 @@ process_star_office (GsfInput *src, + gsf_input_read (src, size, (unsigned char*) buf); + if ( (buf[0] != 0x0F) || + (buf[1] != 0x0) || +- (0 != strncmp (&buf[2], +- "SfxDocumentInfo", +- strlen ("SfxDocumentInfo"))) || ++ (0 != strcmp (&buf[2], ++ "SfxDocumentInfo")) || + (buf[0x11] != 0x0B) || + (buf[0x13] != 0x00) || /* pw protected! */ + (buf[0x12] != 0x00) ) |