From 3b24d6e187f6c59cd33003aeeea54cdadc16f180 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 19 Jul 2019 13:40:25 -0400 Subject: [PATCH] gtk3: fix pkgconfig paths MR Upstream: https://gitlab.gnome.org/GNOME/gtk/merge_requests/1002 --- ...build-Fix-path-handling-in-pkgconfig.patch | 30 +++++++++++++++++++ pkgs/development/libraries/gtk+/3.x.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/libraries/gtk+/01-build-Fix-path-handling-in-pkgconfig.patch diff --git a/pkgs/development/libraries/gtk+/01-build-Fix-path-handling-in-pkgconfig.patch b/pkgs/development/libraries/gtk+/01-build-Fix-path-handling-in-pkgconfig.patch new file mode 100644 index 00000000000..ec69a12514f --- /dev/null +++ b/pkgs/development/libraries/gtk+/01-build-Fix-path-handling-in-pkgconfig.patch @@ -0,0 +1,30 @@ +From 7b692e618c4183a51af3d3b0037f106c4fec2355 Mon Sep 17 00:00:00 2001 +From: worldofpeace +Date: Fri, 19 Jul 2019 13:32:57 -0400 +Subject: [PATCH] build: Fix path handling in pkgconfig + +--- + meson.build | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/meson.build b/meson.build +index 36913b3f04..161b378ba5 100644 +--- a/meson.build ++++ b/meson.build +@@ -834,10 +834,10 @@ configure_file(input: 'config.h.meson', + # pkg-config files - bit of a mess all of this + pkgconf = configuration_data() + +-pkgconf.set('prefix', get_option('prefix')) ++pkgconf.set('prefix', gtk_prefix) + pkgconf.set('exec_prefix', '${prefix}') +-pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir'))) +-pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir'))) ++pkgconf.set('libdir', gtk_libdir) ++pkgconf.set('includedir', join_paths('${prefix}', gtk_includedir)) + pkgconf.set('GTK_API_VERSION', gtk_api_version) + pkgconf.set('VERSION', meson.project_version()) + pkgconf.set('GTK_BINARY_VERSION', gtk_binary_version) +-- +2.22.0 + diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 60c04bf8a59..8c3df083087 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -64,6 +64,8 @@ stdenv.mkDerivation rec { url = "https://bug757142.bugzilla-attachments.gnome.org/attachment.cgi?id=344123"; sha256 = "0g6fhqcv8spfy3mfmxpyji93k8d4p4q4fz1v9a1c1cgcwkz41d7p"; }) + # https://gitlab.gnome.org/GNOME/gtk/merge_requests/1002 + ./01-build-Fix-path-handling-in-pkgconfig.patch ] ++ 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