From 2206a3ebadbea29de6f1760687ff6cb6f77b66fc Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Sat, 9 Mar 2019 17:30:23 +0100 Subject: [PATCH] Merge #57095: gtk3: Fix for missing symbols (again) (cherry picked from commit 3ea5f97ac4c44b427fcd1a39f50c430116600677) Forward-picking from staging to staging-next. It seems quite an important fix with little risk of breakage, and it isn't such a huge rebuild, especially considering the unfinished amount on staging-next ATM. --- pkgs/development/libraries/gtk+/3.x.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 579fca06ffb..19abca1cabb 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -40,6 +40,13 @@ stdenv.mkDerivation rec { url = https://github.com/gnome/gtk/compare/3.24.5..47e4a111c2666961ab47b6df48460d3c9075d92d.patch; sha256 = "0ky4kmgcywg0qlwndn9aw083bkwnkr49bnlsz0ii93fxzvbiqglr"; }) + (fetchpatch { + # https://gitlab.gnome.org/GNOME/gtk/merge_requests/505 already merged + # but isn't in 3.24.5 + name = "export-missing-symbols.patch"; + url = https://gitlab.gnome.org/GNOME/gtk/commit/95c0f07295fd300ab7f3416a39290ae33585ea6c.patch; + sha256 = "0z9w7f39xcn1cbcd8jhx731vq64nvi5q6kyc86bq8r00daysjwnl"; + }) ] ++ optionals stdenv.isDarwin [ # X11 module requires which is not installed on Darwin # let’s drop that dependency in similar way to how other parts of the library do it