gtk3: fix pkgconfig paths
MR Upstream: https://gitlab.gnome.org/GNOME/gtk/merge_requests/1002
This commit is contained in:
parent
0ce55a10d2
commit
3b24d6e187
@ -0,0 +1,30 @@
|
||||
From 7b692e618c4183a51af3d3b0037f106c4fec2355 Mon Sep 17 00:00:00 2001
|
||||
From: worldofpeace <worldofpeace@protonmail.ch>
|
||||
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
|
||||
|
@ -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 <gio/gdesktopappinfo.h> which is not installed on Darwin
|
||||
# let’s drop that dependency in similar way to how other parts of the library do it
|
||||
|
Loading…
Reference in New Issue
Block a user