diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix index 1db426669bb..5c3b309ba9b 100644 --- a/pkgs/tools/archivers/gnutar/default.nix +++ b/pkgs/tools/archivers/gnutar/default.nix @@ -37,4 +37,14 @@ stdenv.mkDerivation (rec { # cannot be used as a login shell for now. // stdenv.lib.optionalAttrs (stdenv.system == "armv7l-linux") { FORCE_UNSAFE_CONFIGURE = 1; +} + +// + +{ + crossAttrs = + # XXX: Temporary workaround to allow GNU/Hurd builds with newer libcs. + (stdenv.lib.optionalAttrs (stdenv.cross.config == "i586-pc-gnu") { + patches = [ ../../misc/coreutils/gets-undeclared.patch ]; + }); }) diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index b32bbb932e8..a49a741c5ca 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { name = "gzip-1.4"; src = fetchurl { @@ -31,3 +31,13 @@ stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.ludo ]; }; } + +// + +{ + crossAttrs = + # XXX: Temporary workaround to allow GNU/Hurd builds with newer libcs. + (stdenv.lib.optionalAttrs (stdenv.cross.config == "i586-pc-gnu") { + patches = [ ../../misc/coreutils/gets-undeclared.patch ]; + }); +}) diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix index eae48f2e3a4..086a44675a9 100644 --- a/pkgs/tools/text/diffutils/default.nix +++ b/pkgs/tools/text/diffutils/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, coreutils ? null}: -stdenv.mkDerivation { +stdenv.mkDerivation ({ name = "diffutils-3.2"; src = fetchurl { @@ -16,3 +16,13 @@ stdenv.mkDerivation { description = "Commands for showing the differences between files (diff, cmp, etc.)"; }; } + +// + +{ + crossAttrs = + # XXX: Temporary workaround to allow GNU/Hurd builds with newer libcs. + (stdenv.lib.optionalAttrs (stdenv.cross.config == "i586-pc-gnu") { + patches = [ ../../misc/coreutils/gets-undeclared.patch ]; + }); +})