diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2024-01-14 14:51:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-14 14:51:01 +0100 |
| commit | d1f5807b863b45c0f10f2e45f6ae98d9ddb2e587 (patch) | |
| tree | 6d3f023b5aac3f57951270e79dd391ffd32c6357 /pkgs/applications/editors | |
| parent | 5be07a5ef3b15efca5cc561b24628a2d5ab7f4e9 (diff) | |
| parent | bfb58157d580deeaf69a96a71a4e9ddfdd1b997e (diff) | |
Merge pull request #280933 from bobby285271/fix/xed-plugins
xed-editor: Fix typelib path
Diffstat (limited to 'pkgs/applications/editors')
| -rw-r--r-- | pkgs/applications/editors/xed-editor/correct-gir-lib-path.patch | 13 | ||||
| -rw-r--r-- | pkgs/applications/editors/xed-editor/default.nix | 6 |
2 files changed, 19 insertions, 0 deletions
diff --git a/pkgs/applications/editors/xed-editor/correct-gir-lib-path.patch b/pkgs/applications/editors/xed-editor/correct-gir-lib-path.patch new file mode 100644 index 0000000000000..fa530e9a12afa --- /dev/null +++ b/pkgs/applications/editors/xed-editor/correct-gir-lib-path.patch @@ -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( diff --git a/pkgs/applications/editors/xed-editor/default.nix b/pkgs/applications/editors/xed-editor/default.nix index 164b1fee45dec..8ce15bdce09eb 100644 --- a/pkgs/applications/editors/xed-editor/default.nix +++ b/pkgs/applications/editors/xed-editor/default.nix @@ -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 |