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
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
  NIX_CFLAGS_COMPILE = "-static-libgcc";

  configureFlags = "--disable-werror" # needed for dietlibc build
-      + stdenv.lib.optionalString (stdenv.system == "mips64-linux")
+      + stdenv.lib.optionalString (stdenv.system == "mips64el-linux")
        " --enable-fix-loongson2f-nop"
      + stdenv.lib.optionalString (cross != null) " --target=${cross.config}"
      + stdenv.lib.optionalString gold " --enable-gold";