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

2021-05-14 21:57:09 -07:00
parent c48eaa70e3 72948af15b
commit 0546e68ef7
13 changed files with 107 additions and 25 deletions
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchFromGitHub, pkg-config, libtool
 , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg, djvulibre
 , lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp, fftw, libheif, libde265
-, ApplicationServices
+, ApplicationServices, Foundation
 }:

 let
@@ -50,7 +50,8 @@ stdenv.mkDerivation rec {
    ]
    ++ lib.optionals (!stdenv.hostPlatform.isMinGW)
      [ openexr librsvg openjpeg ]
-    ++ lib.optional stdenv.isDarwin ApplicationServices;
+    ++ lib.optionals stdenv.isDarwin
+      [ ApplicationServices Foundation ];

  propagatedBuildInputs =
    [ bzip2 freetype libjpeg lcms2 fftw ]