From a1a1d335e1fe42f2e499ff0b2253520af802defc Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Wed, 5 Apr 2023 18:55:58 -0700 Subject: [PATCH] wv: fix cross compilation, add autoreconfHook --- pkgs/tools/misc/wv/default.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/wv/default.nix b/pkgs/tools/misc/wv/default.nix index 32cdeaa28867..3b581f8ea154 100644 --- a/pkgs/tools/misc/wv/default.nix +++ b/pkgs/tools/misc/wv/default.nix @@ -1,5 +1,8 @@ { lib, stdenv, fetchurl, zlib, imagemagick, libpng, glib, pkg-config, libgsf -, libxml2, bzip2 }: +, libxml2, bzip2 +, autoreconfHook +, buildPackages +}: stdenv.mkDerivation rec { pname = "wv"; @@ -10,11 +13,20 @@ stdenv.mkDerivation rec { sha256 = "17f16lkdv1c3amaz2hagiicih59ynpp4786k1m2qa1sw68xhswsc"; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ zlib imagemagick libpng glib libgsf libxml2 bzip2 ]; + configureFlags = [ + "PKG_CONFIG=${buildPackages.pkg-config}/bin/${buildPackages.pkg-config.targetPrefix}pkg-config" + ]; + hardeningDisable = [ "format" ]; + # autoreconfHook fails hard if these two files do not exist + postPatch = '' + touch AUTHORS ChangeLog + ''; + meta = { description = "Converter from Microsoft Word formats to human-editable ones"; platforms = lib.platforms.unix;