nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix

various: Enable updateAutotoolsGnuConfigScriptsHook

Prior to August 2023, any config.guess generated by autoconf will
include a hardcoded /usr/bin/uname invocation for FreeBSD on any
architecture other than arm. This clearly doesn't work under nix.
We must then update or otherwise patch each old config.guess.

authored by

Audrey Dutcher and committed by
John Ericson
846de80d 9e21798e

+114 -33
+2 -1
pkgs/applications/networking/sync/rsync/default.nix
··· 1 1 { lib 2 2 , stdenv 3 3 , fetchurl 4 + , updateAutotoolsGnuConfigScriptsHook 4 5 , perl 5 6 , libiconv 6 7 , zlib ··· 29 28 hash = "sha256-c5nppnCMMtZ4pypjIZ6W8jvgviM25Q/RNISY0HBB35A="; 30 29 }; 31 30 32 - nativeBuildInputs = [ perl ]; 31 + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook perl ]; 33 32 34 33 buildInputs = [ libiconv zlib popt ] 35 34 ++ lib.optional enableACLs acl
+2 -2
pkgs/development/libraries/c-ares/default.nix
··· 1 - { lib, stdenv, fetchurl, writeTextDir 1 + { lib, stdenv, fetchurl, updateAutotoolsGnuConfigScriptsHook 2 2 , withCMake ? true, cmake 3 3 4 4 # sensitive downstream packages ··· 22 22 23 23 outputs = [ "out" "dev" "man" ]; 24 24 25 - nativeBuildInputs = lib.optionals withCMake [ cmake ]; 25 + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ] ++ lib.optionals withCMake [ cmake ]; 26 26 27 27 cmakeFlags = [] ++ lib.optionals stdenv.hostPlatform.isStatic [ 28 28 "-DCARES_SHARED=OFF"
+2
pkgs/development/libraries/expat/default.nix
··· 1 1 { lib 2 2 , stdenv 3 3 , fetchurl 4 + , updateAutotoolsGnuConfigScriptsHook 4 5 # for passthru.tests 5 6 , python3 6 7 , perlPackages ··· 30 29 }; 31 30 32 31 strictDeps = true; 32 + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; 33 33 34 34 outputs = [ "out" "dev" ]; # TODO: fix referrers 35 35 outputBin = "dev";
+3 -1
pkgs/development/libraries/gdbm/default.nix
··· 1 - { stdenv, lib, fetchurl }: 1 + { stdenv, lib, fetchurl, updateAutotoolsGnuConfigScriptsHook }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "gdbm"; ··· 8 8 url = "mirror://gnu/gdbm/${pname}-${version}.tar.gz"; 9 9 sha256 = "sha256-dLEIHSH/8TrkvXwW5dblBKTCb3zeHcoNljpIQXS7ys0="; 10 10 }; 11 + 12 + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; 11 13 12 14 doCheck = true; # not cross; 13 15
+4 -1
pkgs/development/libraries/gettext/default.nix
··· 1 - { stdenv, lib, fetchurl, libiconv, bash 1 + { stdenv, lib, fetchurl, libiconv, bash, updateAutotoolsGnuConfigScriptsHook 2 2 }: 3 3 4 4 # Note: this package is used for bootstrapping fetchurl, and thus ··· 50 50 ''; 51 51 52 52 strictDeps = true; 53 + nativeBuildInputs = [ 54 + updateAutotoolsGnuConfigScriptsHook 55 + ]; 53 56 buildInputs = lib.optionals (!stdenv.hostPlatform.isMinGW) [ 54 57 bash 55 58 ]
+5
pkgs/development/libraries/kerberos/krb5.nix
··· 74 74 postPatch = '' 75 75 substituteInPlace config/shlib.conf \ 76 76 --replace "'ld " "'${stdenv.cc.targetPrefix}ld " 77 + '' 78 + # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion 79 + # necessary for FreeBSD code path in configure 80 + + '' 81 + substituteInPlace ./config/config.guess --replace-fail /usr/bin/uname uname 77 82 ''; 78 83 79 84 libFolders = [ "util" "include" "lib" "build-tools" ];
+3 -1
pkgs/development/libraries/libev/default.nix
··· 1 - { lib, stdenv, fetchurl 1 + { lib, stdenv, fetchurl, updateAutotoolsGnuConfigScriptsHook 2 2 , # Note: -static hasn’t work on darwin 3 3 static ? with stdenv.hostPlatform; isStatic && !isDarwin 4 4 }: ··· 16 16 url = "http://dist.schmorp.de/libev/Attic/${pname}-${version}.tar.gz"; 17 17 sha256 = "1sjs4324is7fp21an4aas2z4dwsvs6z4xwrmp72vwpq1s6wbfzjh"; 18 18 }; 19 + 20 + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; 19 21 20 22 configureFlags = lib.optional (static) "LDFLAGS=-static"; 21 23
+6
pkgs/development/libraries/libssh2/default.nix
··· 15 15 ./CVE-2023-48795.patch 16 16 ]; 17 17 18 + # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion 19 + # necessary for FreeBSD code path in configure 20 + postPatch = '' 21 + substituteInPlace ./config.guess --replace-fail /usr/bin/uname uname 22 + ''; 23 + 18 24 outputs = [ "out" "dev" "devdoc" ]; 19 25 20 26 propagatedBuildInputs = [ openssl ]; # see Libs: in libssh2.pc
+6
pkgs/development/libraries/libxcrypt/default.nix
··· 15 15 hash = "sha256-5eH0yu4KAd4q7ibjE4gH1tPKK45nKHlm0f79ZeH9iUM="; 16 16 }; 17 17 18 + # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion 19 + # necessary for FreeBSD code path in configure 20 + postPatch = '' 21 + substituteInPlace ./build-aux/m4-autogen/config.guess --replace-fail /usr/bin/uname uname 22 + ''; 23 + 18 24 outputs = [ 19 25 "out" 20 26 "man"
+3 -1
pkgs/development/libraries/lzo/default.nix
··· 1 - {lib, stdenv, fetchurl}: 1 + { lib, stdenv, fetchurl, updateAutotoolsGnuConfigScriptsHook }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "lzo"; ··· 8 8 url = "https://www.oberhumer.com/opensource/lzo/download/${pname}-${version}.tar.gz"; 9 9 sha256 = "0wm04519pd3g8hqpjqhfr72q8qmbiwqaxcs3cndny9h86aa95y60"; 10 10 }; 11 + 12 + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; 11 13 12 14 configureFlags = lib.optional (!stdenv.hostPlatform.isStatic) "--enable-shared" ; 13 15
+3 -1
pkgs/development/libraries/mpdecimal/default.nix
··· 1 - { lib, stdenv, fetchurl }: 1 + { lib, stdenv, fetchurl, updateAutotoolsGnuConfigScriptsHook }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "mpdecimal"; ··· 9 9 url = "https://www.bytereef.org/software/mpdecimal/releases/mpdecimal-${version}.tar.gz"; 10 10 hash = "sha256-lCRFwyRbInMP1Bpnp8XCMdEcsbmTa5wPdjNPt9C0Row="; 11 11 }; 12 + 13 + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; 12 14 13 15 configureFlags = [ "LD=${stdenv.cc.targetPrefix}cc" ]; 14 16
+2
pkgs/development/libraries/ncurses/default.nix
··· 2 2 , stdenv 3 3 , fetchurl 4 4 , buildPackages 5 + , updateAutotoolsGnuConfigScriptsHook 5 6 , ncurses 6 7 , pkg-config 7 8 , abiVersion ? "6" ··· 69 68 strictDeps = true; 70 69 71 70 nativeBuildInputs = [ 71 + updateAutotoolsGnuConfigScriptsHook 72 72 pkg-config 73 73 ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ 74 74 # for `tic`, build already depends on for build `cc` so it's weird the build doesn't just build `tic`.
+6
pkgs/development/libraries/nghttp2/default.nix
··· 67 67 export TZDIR=${tzdata}/share/zoneinfo 68 68 ''; 69 69 70 + # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion 71 + # necessary for FreeBSD code path in configure 72 + postPatch = '' 73 + substituteInPlace ./config.guess --replace-fail /usr/bin/uname uname 74 + ''; 75 + 70 76 postInstall = lib.optionalString (enableApp) '' 71 77 installShellCompletion --bash doc/bash_completion/{h2load,nghttp,nghttpd,nghttpx} 72 78 '' + lib.optionalString (!enableApp) ''
+3
pkgs/development/libraries/pcre2/default.nix
··· 1 1 { lib 2 2 , stdenv 3 3 , fetchurl 4 + , updateAutotoolsGnuConfigScriptsHook 4 5 , withJitSealloc ? true 5 6 }: 6 7 ··· 13 12 url = "https://github.com/PhilipHazel/pcre2/releases/download/pcre2-${version}/pcre2-${version}.tar.bz2"; 14 13 hash = "sha256-4qU5hP8LB9/bWuRIa7ubIcyo598kNAlsyb8bcow1C8s="; 15 14 }; 15 + 16 + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; 16 17 17 18 postPatch = '' 18 19 # Fix jit autodetection:
+3
pkgs/development/libraries/popt/default.nix
··· 2 2 , stdenv 3 3 , fetchurl 4 4 , fetchpatch2 5 + , updateAutotoolsGnuConfigScriptsHook 5 6 }: 6 7 7 8 stdenv.mkDerivation rec { ··· 13 12 url = "https://ftp.osuosl.org/pub/rpm/popt/releases/popt-1.x/popt-${version}.tar.gz"; 14 13 sha256 = "sha256-wlpIOPyOTByKrLi9Yg7bMISj1jv4mH/a08onWMYyQPk="; 15 14 }; 15 + 16 + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; 16 17 17 18 patches = lib.optionals stdenv.isCygwin [ 18 19 ./1.16-cygwin.patch
+2
pkgs/development/libraries/readline/8.2.nix
··· 1 1 { lib, stdenv 2 2 , fetchpatch, fetchurl 3 + , updateAutotoolsGnuConfigScriptsHook 3 4 , ncurses, termcap 4 5 , curses-library ? 5 6 if stdenv.hostPlatform.isWindows ··· 21 20 22 21 strictDeps = true; 23 22 propagatedBuildInputs = [ curses-library ]; 23 + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; 24 24 25 25 patchFlags = [ "-p0" ]; 26 26
+2
pkgs/development/libraries/sqlite/default.nix
··· 1 1 { lib, stdenv, fetchurl, zlib, readline, ncurses 2 + , updateAutotoolsGnuConfigScriptsHook 2 3 3 4 # for tests 4 5 , python3Packages, sqldiff, sqlite-analyzer, tracker ··· 28 27 outputs = [ "bin" "dev" "out" ]; 29 28 separateDebugInfo = stdenv.isLinux; 30 29 30 + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; 31 31 buildInputs = [ zlib ] ++ lib.optionals interactive [ readline ncurses ]; 32 32 33 33 # required for aarch64 but applied for all arches for simplicity
+2 -1
pkgs/development/tools/build-managers/gnumake/default.nix
··· 1 1 { lib 2 2 , stdenv 3 3 , fetchurl 4 + , updateAutotoolsGnuConfigScriptsHook 4 5 , guileSupport ? false, guile 5 6 # avoid guile depend on bootstrap to prevent dependency cycles 6 7 , inBootstrap ? false ··· 32 31 ./0002-remove-impure-dirs.patch 33 32 ]; 34 33 35 - nativeBuildInputs = lib.optionals guileEnabled [ pkg-config ]; 34 + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ] ++ lib.optionals guileEnabled [ pkg-config ]; 36 35 buildInputs = lib.optionals guileEnabled [ guile ]; 37 36 38 37 configureFlags = lib.optional guileEnabled "--with-guile"
+2 -2
pkgs/development/tools/misc/automake/automake-1.16.x.nix
··· 1 - { lib, stdenv, fetchurl, perl, autoconf }: 1 + { lib, stdenv, fetchurl, perl, autoconf, updateAutotoolsGnuConfigScriptsHook }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "automake"; ··· 10 10 }; 11 11 12 12 strictDeps = true; 13 - nativeBuildInputs = [ autoconf perl ]; 13 + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook autoconf perl ]; 14 14 buildInputs = [ autoconf ]; 15 15 16 16 setupHook = ./setup-hook.sh;
+2 -2
pkgs/development/tools/misc/dejagnu/default.nix
··· 1 - { fetchurl, lib, stdenv, expect, makeWrapper }: 1 + { fetchurl, lib, stdenv, expect, makeWrapper, updateAutotoolsGnuConfigScriptsHook }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "dejagnu"; ··· 9 9 sha256 = "1qx2cv6qkxbiqg87jh217jb62hk3s7dmcs4cz1llm2wmsynfznl7"; 10 10 }; 11 11 12 - nativeBuildInputs = [ makeWrapper ]; 12 + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook makeWrapper ]; 13 13 buildInputs = [ expect ]; 14 14 15 15 # dejagnu-1.6.3 can't successfully run tests in source tree:
+7 -2
pkgs/development/tools/misc/gnum4/default.nix
··· 16 16 17 17 # https://gitweb.gentoo.org/repo/gentoo.git/tree/sys-devel/m4/m4-1.4.19-r1.ebuild 18 18 patches = lib.optional stdenv.hostPlatform.isLoongArch64 ./loong-fix-build.patch; 19 - postPatch = if stdenv.hostPlatform.isLoongArch64 then '' 19 + # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion 20 + # necessary for FreeBSD code path in configure 21 + postPatch = '' 22 + substituteInPlace ./build-aux/config.guess --replace-fail /usr/bin/uname uname 23 + '' + lib.optionalString stdenv.hostPlatform.isLoongArch64 '' 20 24 touch ./aclocal.m4 ./lib/config.hin ./configure ./doc/stamp-vti || die 21 25 find . -name Makefile.in -exec touch {} + || die 22 - '' else null; 26 + ''; 23 27 24 28 strictDeps = true; 29 + 25 30 enableParallelBuilding = true; 26 31 27 32 doCheck = false;
+2 -1
pkgs/development/tools/misc/libtool/libtool2.nix
··· 1 1 { lib, stdenv, fetchurl, m4 2 2 , runtimeShell 3 + , updateAutotoolsGnuConfigScriptsHook 3 4 , file 4 5 }: 5 6 ··· 39 38 # As libtool is an early bootstrap dependency try hard not to 40 39 # add autoconf and automake or help2man dependencies here. That way we can 41 40 # avoid pulling in perl and get away with just an `m4` depend. 42 - nativeBuildInputs = [ m4 file ]; 41 + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook m4 file ]; 43 42 propagatedBuildInputs = [ m4 file ]; 44 43 45 44 # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the
+8 -3
pkgs/development/tools/misc/pkg-config/default.nix
··· 19 19 ++ lib.optional stdenv.isCygwin ./2.36.3-not-win32.patch; 20 20 21 21 # These three tests fail due to a (desired) behavior change from our ./requires-private.patch 22 - postPatch = if vanilla then null else '' 23 - rm -f check/check-requires-private check/check-gtk check/missing 24 - ''; 22 + postPatch = 23 + # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion 24 + # necessary for FreeBSD code path in configure 25 + '' 26 + substituteInPlace ./config.guess ./glib/config.guess --replace-fail /usr/bin/uname uname 27 + '' + lib.optionalString (!vanilla) '' 28 + rm -f check/check-requires-private check/check-gtk check/missing 29 + ''; 25 30 26 31 buildInputs = [ libiconv ]; 27 32
+2 -1
pkgs/development/tools/misc/texinfo/common.nix
··· 1 1 { version, sha256, patches ? [] }: 2 2 3 3 { lib, stdenv, buildPackages, fetchurl, perl, libintl, bash 4 - , gnulib, gawk, freebsd, libiconv 4 + , updateAutotoolsGnuConfigScriptsHook, gnulib, gawk, freebsd, libiconv 5 5 6 6 # we are a dependency of gcc, this simplifies bootstraping 7 7 , interactive ? false, ncurses, procps ··· 49 49 # A native compiler is needed to build tools needed at build time 50 50 depsBuildBuild = [ buildPackages.stdenv.cc perl ]; 51 51 52 + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; 52 53 buildInputs = [ bash libintl ] 53 54 ++ optionals stdenv.isSunOS [ libiconv gawk ] 54 55 ++ optional interactive ncurses;
+2 -1
pkgs/servers/x11/xorg/overrides.nix
··· 3 3 automake, autoconf, libiconv, libtool, intltool, gettext, python3, perl, 4 4 freetype, tradcpp, fontconfig, meson, ninja, ed, fontforge, 5 5 libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm, netbsd, 6 - ncompress, 6 + ncompress, updateAutotoolsGnuConfigScriptsHook, 7 7 mesa, udev, bootstrap_cmds, bison, flex, clangStdenv, autoreconfHook, 8 8 mcpp, libepoxy, openssl, pkg-config, llvm, libxslt, libxcrypt, hwdata, 9 9 ApplicationServices, Carbon, Cocoa, Xplugin, ··· 906 906 907 907 lndir = super.lndir.overrideAttrs (attrs: { 908 908 buildInputs = []; 909 + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; 909 910 preConfigure = '' 910 911 export XPROTO_CFLAGS=" " 911 912 export XPROTO_LIBS=" "
+2 -1
pkgs/shells/bash/5.nix
··· 2 2 , stdenv 3 3 , buildPackages 4 4 , fetchurl 5 + , updateAutotoolsGnuConfigScriptsHook 5 6 , bison 6 7 , util-linux 7 8 ··· 98 97 strictDeps = true; 99 98 # Note: Bison is needed because the patches above modify parse.y. 100 99 depsBuildBuild = [ buildPackages.stdenv.cc ]; 101 - nativeBuildInputs = [ bison ] 100 + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook bison ] 102 101 ++ lib.optional withDocs texinfo 103 102 ++ lib.optional stdenv.hostPlatform.isDarwin stdenv.cc.bintools; 104 103
+3 -2
pkgs/tools/archivers/gnutar/default.nix
··· 1 - { lib, stdenv, fetchurl, autoreconfHook, acl, libintl }: 1 + { lib, stdenv, fetchurl, autoreconfHook, updateAutotoolsGnuConfigScriptsHook, acl, libintl }: 2 2 3 3 # Note: this package is used for bootstrapping fetchurl, and thus 4 4 # cannot use fetchpatch! All mutable patches (generated by GitHub or ··· 30 30 31 31 outputs = [ "out" "info" ]; 32 32 33 - nativeBuildInputs = lib.optional stdenv.isDarwin autoreconfHook; 33 + nativeBuildInputs = lib.optional stdenv.isDarwin autoreconfHook 34 + ++ lib.optional (!stdenv.isDarwin) updateAutotoolsGnuConfigScriptsHook; 34 35 # Add libintl on Darwin specifically as it fails to link (or skip) 35 36 # NLS on it's own: 36 37 # "_libintl_textdomain", referenced from:
+2 -1
pkgs/tools/archivers/sharutils/default.nix
··· 1 - { lib, stdenv, fetchurl, fetchpatch, gettext, coreutils }: 1 + { lib, stdenv, fetchurl, fetchpatch, gettext, coreutils, updateAutotoolsGnuConfigScriptsHook }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "sharutils"; ··· 13 13 14 14 # GNU Gettext is needed on non-GNU platforms. 15 15 buildInputs = [ coreutils gettext ]; 16 + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; 16 17 17 18 # These tests try to hit /etc/passwd to find out your username if pass in a submitter 18 19 # name on the command line. Since we block access to /etc/passwd on the Darwin sandbox
+3 -2
pkgs/tools/compression/gzip/default.nix
··· 1 1 { lib, stdenv 2 2 , fetchurl 3 3 , makeWrapper 4 + , updateAutotoolsGnuConfigScriptsHook 4 5 , xz 5 6 , runtimeShellPackage 6 7 }: ··· 24 23 25 24 enableParallelBuilding = true; 26 25 27 - buildInputs = [ runtimeShellPackage]; 28 - nativeBuildInputs = [ xz.bin makeWrapper ]; 26 + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook makeWrapper ]; 27 + buildInputs = [ runtimeShellPackage ]; 29 28 30 29 makeFlags = [ 31 30 "SHELL=/bin/sh"
+6
pkgs/tools/compression/xz/default.nix
··· 29 29 enableParallelBuilding = true; 30 30 doCheck = true; 31 31 32 + # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion 33 + # necessary for FreeBSD code path in configure 34 + postPatch = '' 35 + substituteInPlace ./build-aux/config.guess --replace-fail /usr/bin/uname uname 36 + ''; 37 + 32 38 preCheck = '' 33 39 # Tests have a /bin/sh dependency... 34 40 patchShebangs tests
+3 -1
pkgs/tools/misc/file/default.nix
··· 1 1 { lib, stdenv, fetchurl, file, zlib, libgnurx 2 + , updateAutotoolsGnuConfigScriptsHook 2 3 , testers 3 4 }: 4 5 ··· 31 30 strictDeps = true; 32 31 enableParallelBuilding = true; 33 32 34 - nativeBuildInputs = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) file; 33 + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ] 34 + ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) file; 35 35 buildInputs = [ zlib ] 36 36 ++ lib.optional stdenv.hostPlatform.isWindows libgnurx; 37 37
+2
pkgs/tools/misc/findutils/default.nix
··· 1 1 { lib, stdenv, fetchurl 2 + , updateAutotoolsGnuConfigScriptsHook 2 3 , coreutils 3 4 }: 4 5 ··· 23 22 24 23 patches = [ ./no-install-statedir.patch ]; 25 24 25 + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; 26 26 buildInputs = [ coreutils ]; # bin/updatedb script needs to call sort 27 27 28 28 # Since glibc-2.25 the i686 tests hang reliably right after test-sleep.
+3
pkgs/tools/networking/curl/default.nix
··· 65 65 ./8.7.1-compression-fix.patch 66 66 ]; 67 67 68 + # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion 69 + # necessary for FreeBSD code path in configure 68 70 postPatch = '' 71 + substituteInPlace ./config.guess --replace-fail /usr/bin/uname uname 69 72 patchShebangs scripts 70 73 ''; 71 74
+2 -2
pkgs/tools/text/diffutils/default.nix
··· 1 - { lib, stdenv, fetchurl, xz, coreutils ? null }: 1 + { lib, stdenv, fetchurl, updateAutotoolsGnuConfigScriptsHook, xz, coreutils ? null }: 2 2 3 3 # Note: this package is used for bootstrapping fetchurl, and thus 4 4 # cannot use fetchpatch! All mutable patches (generated by GitHub or ··· 16 16 17 17 outputs = [ "out" "info" ]; 18 18 19 - nativeBuildInputs = [ (lib.getBin xz) ]; 19 + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook (lib.getBin xz) ]; 20 20 /* If no explicit coreutils is given, use the one from stdenv. */ 21 21 buildInputs = [ coreutils ]; 22 22
+2 -1
pkgs/tools/text/gnugrep/default.nix
··· 1 - { lib, stdenv, glibcLocales, fetchurl, pcre2, libiconv, perl, runtimeShellPackage }: 1 + { lib, stdenv, updateAutotoolsGnuConfigScriptsHook, glibcLocales, fetchurl, pcre2, libiconv, perl, runtimeShellPackage }: 2 2 3 3 # Note: this package is used for bootstrapping fetchurl, and thus 4 4 # cannot use fetchpatch! All mutable patches (generated by GitHub or ··· 26 26 nativeCheckInputs = [ perl glibcLocales ]; 27 27 outputs = [ "out" "info" ]; # the man pages are rather small 28 28 29 + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; 29 30 buildInputs = [ pcre2 libiconv runtimeShellPackage ]; 30 31 31 32 # cygwin: FAIL: multibyte-white-space
+2 -2
pkgs/tools/text/gnused/default.nix
··· 1 - { lib, stdenv, fetchurl, perl }: 1 + { lib, stdenv, fetchurl, updateAutotoolsGnuConfigScriptsHook, perl }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "gnused"; ··· 11 11 12 12 outputs = [ "out" "info" ]; 13 13 14 - nativeBuildInputs = [ perl ]; 14 + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook perl ]; 15 15 preConfigure = "patchShebangs ./build-aux/help2man"; 16 16 17 17 # Prevents attempts of running 'help2man' on cross-built binaries.