qbit/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #314670 from rhelmot/freebsd-minimal3/xz-uses

Browse Source 
gettext, texinfo: Remove spurious xz
This commit is contained in:
John Ericson 2024-05-27 10:48:33 -04:00 committed by GitHub
commit 9e21798e8f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/gettext/default.nix
View File

@ -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 # Note: this package is used for bootstrapping fetchurl, and thus
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
LDFLAGS = lib.optionalString stdenv.isSunOS "-lm -lmd -lmp -luutil -lnvpair -lnsl -lidmap -lavl -lsec"; LDFLAGS = lib.optionalString stdenv.isSunOS "-lm -lmd -lmp -luutil -lnvpair -lnsl -lidmap -lavl -lsec";
configureFlags = [ configureFlags = [
"--disable-csharp" "--with-xz" "--disable-csharp"
] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
# On cross building, gettext supposes that the wchar.h from libc # On cross building, gettext supposes that the wchar.h from libc
# does not fulfill gettext needs, so it tries to work with its # does not fulfill gettext needs, so it tries to work with its
@ -50,10 +50,6 @@ stdenv.mkDerivation rec {
''; '';
strictDeps = true; strictDeps = true;
nativeBuildInputs = [
xz
xz.bin
];
buildInputs = lib.optionals (!stdenv.hostPlatform.isMinGW) [ buildInputs = lib.optionals (!stdenv.hostPlatform.isMinGW) [
bash bash
] ]

4
pkgs/development/tools/misc/texinfo/common.nix
View File

@ -1,6 +1,6 @@
{ version, sha256, patches ? [] }: { version, sha256, patches ? [] }:
{ lib, stdenv, buildPackages, fetchurl, perl, xz, libintl, bash { lib, stdenv, buildPackages, fetchurl, perl, libintl, bash
, gnulib, gawk, freebsd, libiconv , gnulib, gawk, freebsd, libiconv
# we are a dependency of gcc, this simplifies bootstraping # we are a dependency of gcc, this simplifies bootstraping
@ -49,7 +49,7 @@ stdenv.mkDerivation {
# A native compiler is needed to build tools needed at build time # A native compiler is needed to build tools needed at build time
depsBuildBuild = [ buildPackages.stdenv.cc perl ]; depsBuildBuild = [ buildPackages.stdenv.cc perl ];
buildInputs = [ xz.bin bash libintl ] buildInputs = [ bash libintl ]
++ optionals stdenv.isSunOS [ libiconv gawk ] ++ optionals stdenv.isSunOS [ libiconv gawk ]
++ optional interactive ncurses; ++ optional interactive ncurses;