From 086c62dd5eab696e889d6fb87c3cc0d10ca00762 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 27 Mar 2022 16:28:48 +0200 Subject: [PATCH] glib: Revert patch likely causing Inkscape build to fail on Darwin --- pkgs/development/libraries/glib/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index ecae47b3d2dd..f057618e7880 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -54,6 +54,14 @@ stdenv.mkDerivation rec { patches = optionals stdenv.isDarwin [ ./darwin-compilation.patch + + # Fix Inkscape compilation with clang++ + # https://gitlab.gnome.org/GNOME/glib/-/issues/2625 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/glib/-/commit/97d39b745ff1f621424f68a41ce0a7c5bb554c87.patch"; + sha256 = "wftuyf3ExFfrISngCQpEUpIGfHCCLXeYv/PEb/TE6a8="; + revert = true; + }) ] ++ optionals stdenv.hostPlatform.isMusl [ ./quark_init_on_demand.patch ./gobject_init_on_demand.patch