Merge pull request #280933 from bobby285271/fix/xed-plugins

xed-editor: Fix typelib path
This commit is contained in:
Jörg Thalheim 2024-01-14 14:51:01 +01:00 committed by GitHub
commit d1f5807b86
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 0 deletions

View file

@ -0,0 +1,13 @@
diff --git a/xed/meson.build b/xed/meson.build
index 7525bad..ae0814e 100644
--- a/xed/meson.build
+++ b/xed/meson.build
@@ -143,7 +143,7 @@ libxed = library(
dependencies: xed_deps,
include_directories: include_dirs,
install: true,
- install_dir: join_paths(libdir, 'xed')
+ install_dir: join_paths(prefix, libdir, 'xed')
)
install_headers(

View file

@ -28,6 +28,12 @@ stdenv.mkDerivation rec {
sha256 = "sha256-MXRxzmRo/dRhp5Llib9ng1gzWW8uvzqTMjUVK8a3eJ8=";
};
patches = [
# We patch gobject-introspection and meson to store absolute paths to libraries in typelibs
# but that requires the install_dir is an absolute path.
./correct-gir-lib-path.patch
];
nativeBuildInputs = [
meson
pkg-config