Merge staging-next into staging

2021-05-12 18:32:29 +00:00
parent a605e0318d f214722172
commit b057978bb2
48 changed files with 373 additions and 145 deletions
@@ -15,6 +15,7 @@
 , libheif
 , librsvg
 , ApplicationServices
+, Foundation
 , python27
 , libpng
 , fetchFromGitHub
@@ -68,7 +69,7 @@ stdenv.mkDerivation rec {
    python27
    libpng
    expat
-  ] ++ lib.optional stdenv.isDarwin ApplicationServices;
+  ] ++ lib.optionals stdenv.isDarwin [ApplicationServices Foundation];

  # Required by .pc file
  propagatedBuildInputs = [