diff options
| author | Lluís Batlle i Rossell <viric@viric.name> | 2012-08-15 09:56:13 +0200 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@viric.name> | 2012-08-15 09:56:13 +0200 |
| commit | eadcd7dab64aa2cabd7fdf0a4be90cc6fdf5b168 (patch) | |
| tree | ac3fcf71d96ac7895844e1df006f92c549d4e40d /pkgs/development/tools/misc/automake | |
| parent | 8a53159a32837d6b4be79bd26a4a4467d0fe678f (diff) | |
| download | nixpkgs-eadcd7dab64aa2cabd7fdf0a4be90cc6fdf5b168.tar nixpkgs-eadcd7dab64aa2cabd7fdf0a4be90cc6fdf5b168.tar.gz nixpkgs-eadcd7dab64aa2cabd7fdf0a4be90cc6fdf5b168.tar.bz2 nixpkgs-eadcd7dab64aa2cabd7fdf0a4be90cc6fdf5b168.tar.lz nixpkgs-eadcd7dab64aa2cabd7fdf0a4be90cc6fdf5b168.tar.xz nixpkgs-eadcd7dab64aa2cabd7fdf0a4be90cc6fdf5b168.tar.zst nixpkgs-eadcd7dab64aa2cabd7fdf0a4be90cc6fdf5b168.zip | |
automake: Disabling tests on mips.
There is a test that fails on mips, and that breaks the nix build. The text does not exist anymore in automake upstream git, so the next version may not need this mips-specific disabling.
Diffstat (limited to 'pkgs/development/tools/misc/automake')
| -rw-r--r-- | pkgs/development/tools/misc/automake/automake-1.11.x.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/automake/automake-1.12.x.nix | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/tools/misc/automake/automake-1.11.x.nix b/pkgs/development/tools/misc/automake/automake-1.11.x.nix index 7c9d06baa54..1e93593d794 100644 --- a/pkgs/development/tools/misc/automake/automake-1.11.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.11.x.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { buildInputs = [perl autoconf makeWrapper]; - inherit doCheck; + # Bug in a test in automake. Upstream git already fixed it removing the test. + doCheck = if stdenv.isMips then false else doCheck; # Disable indented log output from Make, otherwise "make.test" will # fail. diff --git a/pkgs/development/tools/misc/automake/automake-1.12.x.nix b/pkgs/development/tools/misc/automake/automake-1.12.x.nix index e2db84d2fc3..66d43974f6e 100644 --- a/pkgs/development/tools/misc/automake/automake-1.12.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.12.x.nix @@ -23,7 +23,8 @@ stdenv.mkDerivation rec { sed -i -e 's|t/aclocal7.sh||' Makefile.in ''; - inherit doCheck; + # Bug in a test in automake. Upstream git already fixed it removing the test. + doCheck = if stdenv.isMips then false else doCheck; # The test suite can run in parallel. enableParallelBuilding = true; |