svn merge ^/nixpkgs/trunk

Conflicts: cups, all-packages.nix (gcc45_debug) svn path=/nixpkgs/branches/stdenv-updates/; revision=31863
2012-01-26 15:27:03 +00:00
parent f878980c8b d9de74edd6
commit 5b132f6e96
114 changed files with 2051 additions and 1064 deletions
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
    if stdenv.system == "x86_64-linux" then "x86_64" else
    if stdenv.system == "powerpc-linux" then "powerpc" else
    if stdenv.system == "armv5tel-linux" then "arm" else
-    if stdenv.system == "mips64-linux" then "mips" else
+    if stdenv.system == "mips64el-linux" then "mips" else
    abort "don't know what the kernel include directory is called for this platform";

  buildInputs = [perl];