changes proposed for 'release-13.10' into x-updates

Conflicts (simple, taking whole higher/later versions): pkgs/development/libraries/gtk+/2.x.nix pkgs/development/libraries/mesa/default.nix pkgs/development/libraries/polkit/default.nix
2013-11-05 08:38:15 +01:00
parent 923bd1ebf5 1c0fdf2309
commit f448cc022b
19 changed files with 426 additions and 104 deletions
@@ -42,6 +42,7 @@ stdenv.mkDerivation {
  patches = [
    ./static-gallium.patch
    ./dricore-gallium.patch
+    ./werror-wundef.patch
  ];

  # Change the search path for EGL drivers from $drivers/* to driverLink