Merge branch 'staging-next'

2018-08-17 20:51:31 +02:00
parent aa5a93e21d cbabebcc2e
commit 209730208a
248 changed files with 1013 additions and 762 deletions
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
  hardeningDisable = [ "format" ];

  # needs fonts otherwise  don't know how to pass them
-  configureFlags = "--disable-docs";
+  configureFlags = [ "--disable-docs" ];

  enableParallelBuilding = true;

@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
  })];

  # needs fonts otherwise  don't know how to pass them
-  configureFlags = "--disable-docs";
+  configureFlags = [ "--disable-docs" ];

  buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk2 bzip2 intltool libintl ]
    ++ stdenv.lib.optional stdenv.isDarwin OpenGL;