Skip to content

Commit

Permalink
gnome.gedit: fix typelib path
Browse files Browse the repository at this point in the history
We patch gobject-introspection and meson to store absolute paths to libraries in typelibs but that requires the install_dir is an absolute path.
  • Loading branch information
jtojnar committed Nov 16, 2021
1 parent b464f05 commit 1b2a061
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 0 deletions.
13 changes: 13 additions & 0 deletions pkgs/desktops/gnome/apps/gedit/correct-gir-lib-path.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/gedit/meson.build b/gedit/meson.build
index a8683e61a..fc48669f7 100644
--- a/gedit/meson.build
+++ b/gedit/meson.build
@@ -191,7 +191,7 @@ libgedit_shared_lib = shared_library(
c_args: libgedit_c_args,
link_args: libgedit_link_args,
install: true,
- install_dir: get_option('libdir') / 'gedit',
+ install_dir: get_option('prefix') / get_option('libdir') / 'gedit',
)

# GObject Introspection
6 changes: 6 additions & 0 deletions pkgs/desktops/gnome/apps/gedit/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@ stdenv.mkDerivation rec {
sha256 = "149ngl9qw6h59546lir1pa7hvw23ppsnqlj9mfqphmmn5jl99qsm";
};

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 = [
desktop-file-utils
itstool
Expand Down

1 comment on commit 1b2a061

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jtojnar, you pushed a commit directly to master/release branch
instead of going through a Pull Request.

That's highly discouraged beyond the few exceptions listed
on #118661

Please sign in to comment.