Merge branch 'master' into closure-size

TODO: there was more significant refactoring of qtbase and plasma 5.5 on master, and I'm deferring pointing to correct outputs to later.
2015-12-31 09:53:02 +01:00
parent bbcf127c7c 468f698f60
commit f9f6f41bff
951 changed files with 117997 additions and 19014 deletions
@@ -61,6 +61,8 @@ stdenv.mkDerivation ({
      ./security-bdf1ff05.patch
      ./cve-2014-8121.patch
      ./cve-2015-1781.patch
+
+      ./glibc-locale-incompatibility.patch
    ];

  postPatch =