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
@@ -14,6 +14,9 @@ stdenv.mkDerivation rec {
    sha256 = "1f66iss0kqk982azmxbk4xfm2i1csby91vdvly6cr04pz3i1r4rg";
  };

+  # glib-2.62 deprecations
+  NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
+
  preConfigure = lib.optionalString stdenv.hostPlatform.isUnix ''
    perl mkfiles.pl
    ( cd doc ; make );