Merge master into staging-next

2018-07-21 19:43:53 +02:00
parent 8213ff161c cc218fc915
commit ad47d658d1
2090 changed files with 4329 additions and 3730 deletions
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, libXft, cairo, harfbuzz, fribidi
-, libintl, gobjectIntrospection, darwin
+{ stdenv, fetchurl, pkgconfig, libXft, cairo, harfbuzz
+, libintl, gobjectIntrospection, darwin, fribidi
 }:

 with stdenv.lib;