diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-26 08:45:19 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-26 08:45:19 +0000 |
commit | 2ced89b7f14a817d0507747efa22bedaec10e423 (patch) | |
tree | 84a7421d43e02c590b7828d0ab34f1b8e2b1fab5 /pkgs/os-specific/linux/kbd/default.nix | |
parent | b1762c6b49f7fb6469a71e1b59b1f96fcc4dfef2 (diff) | |
parent | ecea8900e7f7278b58d7604aa8a3d5a7ba65bc8f (diff) | |
download | nixlib-2ced89b7f14a817d0507747efa22bedaec10e423.tar nixlib-2ced89b7f14a817d0507747efa22bedaec10e423.tar.gz nixlib-2ced89b7f14a817d0507747efa22bedaec10e423.tar.bz2 nixlib-2ced89b7f14a817d0507747efa22bedaec10e423.tar.lz nixlib-2ced89b7f14a817d0507747efa22bedaec10e423.tar.xz nixlib-2ced89b7f14a817d0507747efa22bedaec10e423.tar.zst nixlib-2ced89b7f14a817d0507747efa22bedaec10e423.zip |
svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=31846
Diffstat (limited to 'pkgs/os-specific/linux/kbd/default.nix')
-rw-r--r-- | pkgs/os-specific/linux/kbd/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix index c54ac4c2c731..cc95a6cff16b 100644 --- a/pkgs/os-specific/linux/kbd/default.nix +++ b/pkgs/os-specific/linux/kbd/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { # We get a warning in armv5tel-linux and the fuloong2f, # so we disable -Werror in it patchPhase = if (stdenv.system == "armv5tel-linux" || - stdenv.system == "mips64-linux") + stdenv.system == "mips64el-linux") then '' sed -i s/-Werror// src/Makefile.am '' else ""; |