diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-09-18 14:51:15 -0400 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-09-18 14:51:15 -0400 |
| commit | a893399776f49f6bbfa425d5ce3d5b54efbe635c (patch) | |
| tree | e9d86e41d32e34a37f8d4133cf06d2ce0bb62f5f /pkgs/tools/archivers/gnutar | |
| parent | 80be1c60d5b3691ba2fdb97e8aaf82d3282cdc3a (diff) | |
| download | nixpkgs-a893399776f49f6bbfa425d5ce3d5b54efbe635c.tar nixpkgs-a893399776f49f6bbfa425d5ce3d5b54efbe635c.tar.gz nixpkgs-a893399776f49f6bbfa425d5ce3d5b54efbe635c.tar.bz2 nixpkgs-a893399776f49f6bbfa425d5ce3d5b54efbe635c.tar.lz nixpkgs-a893399776f49f6bbfa425d5ce3d5b54efbe635c.tar.xz nixpkgs-a893399776f49f6bbfa425d5ce3d5b54efbe635c.tar.zst nixpkgs-a893399776f49f6bbfa425d5ce3d5b54efbe635c.zip | |
Fix more gets() problems
Diffstat (limited to 'pkgs/tools/archivers/gnutar')
| -rw-r--r-- | pkgs/tools/archivers/gnutar/default.nix | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix index 4ef973bd56a..51d5d35fe80 100644 --- a/pkgs/tools/archivers/gnutar/default.nix +++ b/pkgs/tools/archivers/gnutar/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -stdenv.mkDerivation (rec { +stdenv.mkDerivation rec { name = "gnutar-1.26"; src = fetchurl { @@ -8,6 +8,12 @@ stdenv.mkDerivation (rec { sha256 = "0hbdkzmchq9ycr2x1pxqdcgdbaxksh8c6ac0jf75jajhcks6jlss"; }; + patches = [ ./gets-undeclared.patch ]; + + # May have some issues with root compilation because the bootstrap tool + # cannot be used as a login shell for now. + FORCE_UNSAFE_CONFIGURE = stdenv.lib.optionalString (stdenv.system == "armv7l-linux") "1"; + meta = { homepage = http://www.gnu.org/software/tar/; description = "GNU implementation of the `tar' archiver"; @@ -33,18 +39,3 @@ stdenv.mkDerivation (rec { platforms = stdenv.lib.platforms.all; }; } - # May have some issues with root compilation because the bootstrap tool - # 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 = [ ./gets-undeclared.patch ]; - }); -}) |