From b0dce7f79b7c0efaffbdecbc0a576481ce608932 Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 20 May 2022 18:08:13 +0300 Subject: [PATCH] texinfo: enable strictDeps and use libintl instead of gettext optional libintl is null on linux and gettext on darwin --- pkgs/development/tools/misc/texinfo/common.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/texinfo/common.nix b/pkgs/development/tools/misc/texinfo/common.nix index 26732657eb9f..3940843b8b0d 100644 --- a/pkgs/development/tools/misc/texinfo/common.nix +++ b/pkgs/development/tools/misc/texinfo/common.nix @@ -1,6 +1,6 @@ { version, sha256, patches ? [] }: -{ lib, stdenv, buildPackages, fetchurl, perl, xz, gettext +{ lib, stdenv, buildPackages, fetchurl, perl, xz, libintl, bash # we are a dependency of gcc, this simplifies bootstraping , interactive ? false, ncurses, procps @@ -33,13 +33,13 @@ stdenv.mkDerivation { NATIVE_TOOLS_CFLAGS = if crossBuildTools then "-I${getDev buildPackages.ncurses}/include" else null; NATIVE_TOOLS_LDFLAGS = if crossBuildTools then "-L${getLib buildPackages.ncurses}/lib" else null; + strictDeps = true; # We need a native compiler to build perl XS extensions # when cross-compiling. depsBuildBuild = [ buildPackages.stdenv.cc perl ]; - buildInputs = [ xz.bin ] + buildInputs = [ xz.bin bash libintl ] ++ optionals stdenv.isSunOS [ libiconv gawk ] - ++ optionals stdenv.isDarwin [ gettext ] ++ optional interactive ncurses; configureFlags = [ "PERL=${buildPackages.perl}/bin/perl" ]