Merge branch 'master' into staging-next

2020-04-10 12:12:56 +02:00
parent 2e6fb22992 807ca93fad
commit 1ab03c3a76
576 changed files with 6964 additions and 4958 deletions
@@ -16,7 +16,10 @@ stdenv.mkDerivation rec {

  outputs = [ "out" "dev" "installedTests" ];

-  buildInputs = [ libxml2 bzip2 pango libintl ];
+  buildInputs = [ libxml2 bzip2 pango libintl ]
+    ++ lib.optionals stdenv.isDarwin [ darwin.libobjc ];
+
+  NIX_LDFLAGS = if stdenv.isDarwin then "-lobjc" else null;

  propagatedBuildInputs = [ glib gdk-pixbuf cairo ];