Merge branch 'master' into staging

Over 11k rebuilds on master.
2017-02-15 08:41:35 +01:00
parent f228ea5215 b1bfe9d3db
commit 35b2159671
133 changed files with 1837 additions and 1143 deletions
--- a/pkgs/development/libraries/kde-frameworks/kinit/start_kdeinit-path.patch
+++ b/pkgs/development/libraries/kde-frameworks/kinit/start_kdeinit-path.patch
@@ -7,7 +7,7 @@ Index: kinit-5.24.0/src/start_kdeinit/start_kdeinit_wrapper.c
 #include <unistd.h>
 
 -#define EXECUTE CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/start_kdeinit"
-+#define EXECUTE "/var/setuid-wrappers/start_kdeinit"
+#define EXECUTE "/run/wrappers/bin/start_kdeinit"
 
 #if KDEINIT_OOM_PROTECT