diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-09-16 06:01:30 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-16 06:01:30 +0000 |
| commit | 7f935747068f59c55c6102676926ea418ebe1c64 (patch) | |
| tree | 1923adcaf7a5c9d169b33c3ad36ea857986bee93 /pkgs/development/tools/misc | |
| parent | d06d8563410002974273ed1706c7144f62ca37ad (diff) | |
| parent | 9f267c2eb5290577ad75edea6cbacfb9f16208c7 (diff) | |
| download | nixlib-7f935747068f59c55c6102676926ea418ebe1c64.tar nixlib-7f935747068f59c55c6102676926ea418ebe1c64.tar.gz nixlib-7f935747068f59c55c6102676926ea418ebe1c64.tar.bz2 nixlib-7f935747068f59c55c6102676926ea418ebe1c64.tar.lz nixlib-7f935747068f59c55c6102676926ea418ebe1c64.tar.xz nixlib-7f935747068f59c55c6102676926ea418ebe1c64.tar.zst nixlib-7f935747068f59c55c6102676926ea418ebe1c64.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/tools/misc')
| -rw-r--r-- | pkgs/development/tools/misc/texinfo/common.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/tools/misc/texinfo/common.nix b/pkgs/development/tools/misc/texinfo/common.nix index 364f9b148d8c..d8d63088ee7e 100644 --- a/pkgs/development/tools/misc/texinfo/common.nix +++ b/pkgs/development/tools/misc/texinfo/common.nix @@ -1,7 +1,7 @@ { version, sha256, patches ? [] }: { lib, stdenv, buildPackages, fetchurl, perl, xz, libintl, bash -, gnulib +, gnulib, gawk # we are a dependency of gcc, this simplifies bootstraping , interactive ? false, ncurses, procps @@ -57,7 +57,8 @@ stdenv.mkDerivation { configureFlags = [ "PERL=${buildPackages.perl}/bin/perl" ] # Perl XS modules are difficult to cross-compile and texinfo has pure Perl # fallbacks. - ++ optional crossBuildTools "--enable-perl-xs=no" + # Also prevent the buildPlatform's awk being used in the texindex script + ++ optionals crossBuildTools [ "--enable-perl-xs=no" "TI_AWK=${gawk}/bin/awk" ] ++ lib.optional stdenv.isSunOS "AWK=${gawk}/bin/awk"; installFlags = [ "TEXMF=$(out)/texmf-dist" ]; |