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

xed-editor: Fix typelib path

authored by Jörg Thalheim and committed by GitHub d1f5807b 5be07a5e

+19
+13
pkgs/applications/editors/xed-editor/correct-gir-lib-path.patch
··· 1 + diff --git a/xed/meson.build b/xed/meson.build 2 + index 7525bad..ae0814e 100644 3 + --- a/xed/meson.build 4 + +++ b/xed/meson.build 5 + @@ -143,7 +143,7 @@ libxed = library( 6 + dependencies: xed_deps, 7 + include_directories: include_dirs, 8 + install: true, 9 + - install_dir: join_paths(libdir, 'xed') 10 + + install_dir: join_paths(prefix, libdir, 'xed') 11 + ) 12 + 13 + install_headers(
+6
pkgs/applications/editors/xed-editor/default.nix
··· 28 28 sha256 = "sha256-MXRxzmRo/dRhp5Llib9ng1gzWW8uvzqTMjUVK8a3eJ8="; 29 29 }; 30 30 31 + patches = [ 32 + # We patch gobject-introspection and meson to store absolute paths to libraries in typelibs 33 + # but that requires the install_dir is an absolute path. 34 + ./correct-gir-lib-path.patch 35 + ]; 36 + 31 37 nativeBuildInputs = [ 32 38 meson 33 39 pkg-config