Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

Merge pull request #224925 from amjoseph-nixpkgs/pr/wv/cross

wv: fix cross compilation, add autoreconfHook

authored by Adam Joseph and committed by GitHub b3eda21d cdc3c7da

Changed files
+14 -2
pkgs
tools
misc
+14 -2
pkgs/tools/misc/wv/default.nix
··· 1 1 { lib, stdenv, fetchurl, zlib, imagemagick, libpng, glib, pkg-config, libgsf 2 - , libxml2, bzip2 }: 2 + , libxml2, bzip2 3 + , autoreconfHook 4 + , buildPackages 5 + }: 3 6 4 7 stdenv.mkDerivation rec { 5 8 pname = "wv"; ··· 10 13 sha256 = "17f16lkdv1c3amaz2hagiicih59ynpp4786k1m2qa1sw68xhswsc"; 11 14 }; 12 15 13 - nativeBuildInputs = [ pkg-config ]; 16 + nativeBuildInputs = [ pkg-config autoreconfHook ]; 14 17 buildInputs = [ zlib imagemagick libpng glib libgsf libxml2 bzip2 ]; 15 18 19 + configureFlags = [ 20 + "PKG_CONFIG=${buildPackages.pkg-config}/bin/${buildPackages.pkg-config.targetPrefix}pkg-config" 21 + ]; 22 + 16 23 hardeningDisable = [ "format" ]; 24 + 25 + # autoreconfHook fails hard if these two files do not exist 26 + postPatch = '' 27 + touch AUTHORS ChangeLog 28 + ''; 17 29 18 30 meta = { 19 31 description = "Converter from Microsoft Word formats to human-editable ones";