diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-11-16 15:00:20 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2021-11-16 15:01:22 +0100 |
| commit | 1b2a061c87fd079f57a05c5390a42dcc777498f0 (patch) | |
| tree | 2f31e5952e790f6c8fd936f7d513fcec67f0ab83 | |
| parent | b464f0573e4e67978ed00a4bbab567a9bd08fc3c (diff) | |
| download | nixpkgs-1b2a061c87fd079f57a05c5390a42dcc777498f0.tar nixpkgs-1b2a061c87fd079f57a05c5390a42dcc777498f0.tar.gz nixpkgs-1b2a061c87fd079f57a05c5390a42dcc777498f0.tar.bz2 nixpkgs-1b2a061c87fd079f57a05c5390a42dcc777498f0.tar.lz nixpkgs-1b2a061c87fd079f57a05c5390a42dcc777498f0.tar.xz nixpkgs-1b2a061c87fd079f57a05c5390a42dcc777498f0.tar.zst nixpkgs-1b2a061c87fd079f57a05c5390a42dcc777498f0.zip | |
gnome.gedit: fix typelib path
We patch gobject-introspection and meson to store absolute paths to libraries in typelibs but that requires the install_dir is an absolute path.
| -rw-r--r-- | pkgs/desktops/gnome/apps/gedit/correct-gir-lib-path.patch | 13 | ||||
| -rw-r--r-- | pkgs/desktops/gnome/apps/gedit/default.nix | 6 |
2 files changed, 19 insertions, 0 deletions
diff --git a/pkgs/desktops/gnome/apps/gedit/correct-gir-lib-path.patch b/pkgs/desktops/gnome/apps/gedit/correct-gir-lib-path.patch new file mode 100644 index 00000000000..b3689e42066 --- /dev/null +++ b/pkgs/desktops/gnome/apps/gedit/correct-gir-lib-path.patch @@ -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 diff --git a/pkgs/desktops/gnome/apps/gedit/default.nix b/pkgs/desktops/gnome/apps/gedit/default.nix index a8479e9cdca..a6748dfc417 100644 --- a/pkgs/desktops/gnome/apps/gedit/default.nix +++ b/pkgs/desktops/gnome/apps/gedit/default.nix @@ -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 |