Merge remote-tracking branch 'origin/master' into staging

2018-03-28 09:36:47 -04:00
parent 335934a073 c7d7abc51e
commit 05e375d710
196 changed files with 7758 additions and 4938 deletions
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
    })
  ];

-  PKG_CONFIG_GIO_2_0_GIOMODULEDIR = "${placeholder "out"}/lib/gio/modules";
+  PKG_CONFIG_GIO_2_0_GIOMODULEDIR = "lib/gio/modules";

  postPatch = ''
    chmod +x meson_post_install.py # patchShebangs requires executable file