Merge branch 'x-updates' into stdenv-updates

Conflicts (simple): pkgs/development/libraries/glib/default.nix pkgs/development/libraries/mesa/default.nix
2013-09-02 15:44:57 +02:00
parent ed507d70bc 0fc3e2817a
commit 74488e2b58
55 changed files with 434 additions and 356 deletions
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
      + 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"
+      + stdenv.lib.optionalString gold " --enable-gold --enable-plugins"
      + stdenv.lib.optionalString deterministic " --enable-deterministic-archives";

  enableParallelBuilding = true;