diff options
author | Ludovic Courtès <ludo@gnu.org> | 2012-07-01 01:14:43 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2012-07-01 01:14:56 +0200 |
commit | 9786a9826107dd1d7751d06f5d22610ae5283b78 (patch) | |
tree | a3694a7235c73833c128f4033cc4e7df1e6c5d94 /pkgs/tools | |
parent | 81baf55892dea2a443bbd859d8151e118f4e80ff (diff) | |
download | nixlib-9786a9826107dd1d7751d06f5d22610ae5283b78.tar nixlib-9786a9826107dd1d7751d06f5d22610ae5283b78.tar.gz nixlib-9786a9826107dd1d7751d06f5d22610ae5283b78.tar.bz2 nixlib-9786a9826107dd1d7751d06f5d22610ae5283b78.tar.lz nixlib-9786a9826107dd1d7751d06f5d22610ae5283b78.tar.xz nixlib-9786a9826107dd1d7751d06f5d22610ae5283b78.tar.zst nixlib-9786a9826107dd1d7751d06f5d22610ae5283b78.zip |
tar, gzip, diffutils: Allow builds with newer versions of glibc.
This is a follow-up to 77fdc7bb3583606c86b2dd602b76a20a1bf6bc7c ("GNU Coreutils: Allow builds with newer versions of glibc.").
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/archivers/gnutar/default.nix | 10 | ||||
-rw-r--r-- | pkgs/tools/compression/gzip/default.nix | 12 | ||||
-rw-r--r-- | pkgs/tools/text/diffutils/default.nix | 12 |
3 files changed, 32 insertions, 2 deletions
diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix index 1db426669bb9..5c3b309ba9bb 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 b32bbb932e84..a49a741c5ca6 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 eae48f2e3a47..086a44675a9a 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 ]; + }); +}) |