Merge branch 'master' into staging-next

2019-10-03 01:47:08 +02:00
parent 3a4658ea04 3dc58eda52
commit b3fcd9375d
514 changed files with 8443 additions and 3195 deletions
@@ -43,9 +43,8 @@ stdenv.mkDerivation rec {

  propagatedUserEnvPkgs = [ dconf ];

-  # glib-2.58 deprecrated g_type_class_add_private
-  # Should probably be removed next version bump
-  CXXFLAGS = [ "-Wno-deprecated-declarations" ];
+  # glib-2.62 deprecations
+  NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];

  patches = [ ./cmake_check_symbol_exists.patch ];