Merge branch 'master' into staging-next

2021-03-18 19:24:39 +01:00
parent 0136206b12 94bcca22ff
commit 2445e9a681
91 changed files with 982 additions and 256 deletions
@@ -2,9 +2,7 @@

 { lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, cairo, expat, flex
 , fontconfig, gd, gettext, gts, libdevil, libjpeg, libpng, libtool, pango
-, yacc, fetchpatch, xorg ? null, ApplicationServices ? null }:
-
-assert stdenv.isDarwin -> ApplicationServices != null;
+, yacc, fetchpatch, xorg ? null, ApplicationServices }:

 let
  inherit (lib) optional optionals optionalString;