Skip to content

gettext, texinfo: Remove spurious xz #314670

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Ericson2314 merged 2 commits into from
May 27, 2024
Merged

gettext, texinfo: Remove spurious xz #314670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0cbd6c
gettext: remove spurious xz
rhelmot May 26, 2024
9f481b3
texinfo: remove spurious xz buildInput
rhelmot May 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions pkgs/development/libraries/gettext/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, libiconv, xz, bash
{ stdenv, lib, fetchurl, libiconv, bash
}:

# Note: this package is used for bootstrapping fetchurl, and thus
Expand Down Expand Up @@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
LDFLAGS = lib.optionalString stdenv.isSunOS "-lm -lmd -lmp -luutil -lnvpair -lnsl -lidmap -lavl -lsec";

configureFlags = [
"--disable-csharp" "--with-xz"
"--disable-csharp"
] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
# On cross building, gettext supposes that the wchar.h from libc
# does not fulfill gettext needs, so it tries to work with its
Expand All @@ -50,10 +50,6 @@ stdenv.mkDerivation rec {
'';

strictDeps = true;
nativeBuildInputs = [
xz
xz.bin
];
buildInputs = lib.optionals (!stdenv.hostPlatform.isMinGW) [
bash
]
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/tools/misc/texinfo/common.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ version, sha256, patches ? [] }:

{ lib, stdenv, buildPackages, fetchurl, perl, xz, libintl, bash
{ lib, stdenv, buildPackages, fetchurl, perl, libintl, bash
, gnulib, gawk, freebsd, libiconv

# we are a dependency of gcc, this simplifies bootstraping
Expand Down Expand Up @@ -49,7 +49,7 @@ stdenv.mkDerivation {
# A native compiler is needed to build tools needed at build time
depsBuildBuild = [ buildPackages.stdenv.cc perl ];

buildInputs = [ xz.bin bash libintl ]
buildInputs = [ bash libintl ]
++ optionals stdenv.isSunOS [ libiconv gawk ]
++ optional interactive ncurses;

Expand Down