diff options
| author | Danny Wilson <danny@prime.vc> | 2013-02-26 09:19:11 +0000 |
|---|---|---|
| committer | Danny Wilson <danny@onlinetouch.nl> | 2013-02-28 20:04:02 +0100 |
| commit | fcce211c8ee3e65344b7af52a97f2f2bfceca41e (patch) | |
| tree | c1779c4cde99f1b48e2efdb131175fa262f12440 /pkgs/tools/compression/gzip | |
| parent | c019cdb7615ebc89e5a84e5b1fb873139b356b42 (diff) | |
| download | nixpkgs-fcce211c8ee3e65344b7af52a97f2f2bfceca41e.tar nixpkgs-fcce211c8ee3e65344b7af52a97f2f2bfceca41e.tar.gz nixpkgs-fcce211c8ee3e65344b7af52a97f2f2bfceca41e.tar.bz2 nixpkgs-fcce211c8ee3e65344b7af52a97f2f2bfceca41e.tar.lz nixpkgs-fcce211c8ee3e65344b7af52a97f2f2bfceca41e.tar.xz nixpkgs-fcce211c8ee3e65344b7af52a97f2f2bfceca41e.tar.zst nixpkgs-fcce211c8ee3e65344b7af52a97f2f2bfceca41e.zip | |
Fix GZip build on Illumos
Diffstat (limited to 'pkgs/tools/compression/gzip')
| -rw-r--r-- | pkgs/tools/compression/gzip/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/compression/gzip/skip-some-tests.patch | 21 |
2 files changed, 25 insertions, 0 deletions
diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index d15b26f48b6..c1e86b5d2f6 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -8,6 +8,10 @@ stdenv.mkDerivation rec { sha256 = "0wx1nqk709kx75cwp2axachnbxryp4gyl06qxn5nl95184w0mhls"; }; + doCheck = true; + + patches = [ ./skip-some-tests.patch ]; + meta = { homepage = http://www.gnu.org/software/gzip/; description = "Gzip, the GNU zip compression program"; diff --git a/pkgs/tools/compression/gzip/skip-some-tests.patch b/pkgs/tools/compression/gzip/skip-some-tests.patch new file mode 100644 index 00000000000..ebcda684ef7 --- /dev/null +++ b/pkgs/tools/compression/gzip/skip-some-tests.patch @@ -0,0 +1,21 @@ +Skip tests requiring Perl and less (more). +Also zgrep-signal skipping fails with weird Bad file number error on illumos. +--- gzip-1.5/tests/Makefile.in.orig 2013-02-23 15:15:08.017048868 +0000 ++++ gzip-1.5/tests/Makefile.in 2013-02-23 15:15:32.756197039 +0000 +@@ -1421,7 +1421,6 @@ + trailing-nul \ + zdiff \ + zgrep-f \ +- zgrep-signal \ + znew-k + + EXTRA_DIST = \ +@@ -1441,8 +1440,6 @@ + zfgrep \ + zforce \ + zgrep \ +- zless \ +- zmore \ + znew + + TESTS_ENVIRONMENT = \ |