public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gnome3.gnome-shell: fix build with bash-completion 2.10

Browse Source
This commit is contained in:
Jan Tojnar 2020-04-13 17:37:45 +02:00
parent 0d120b1f25
commit bdb2bed66e
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/desktops/gnome-3/core/gnome-shell/default.nix
View File

@ -65,7 +65,10 @@ in stdenv.mkDerivation rec {
# Install bash-completions to correct prefix. # Install bash-completions to correct prefix.
# https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/1194 # https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/1194
./fix-bash-completion.patch (fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gnome-shell/commit/9f1ad5d86ddbabaa840eb2860279d53f4e635453.patch";
sha256 = "f8MDFbfg9D7ORF84Ld9GIvf0xRCYuSszo3QLMji2VaE=";
})
# Use absolute path for libshew installation to make our patched gobject-introspection # Use absolute path for libshew installation to make our patched gobject-introspection
# aware of the location to hardcode in the generated GIR file. # aware of the location to hardcode in the generated GIR file.

10
pkgs/desktops/gnome-3/core/gnome-shell/fix-bash-completion.patch
View File

@ -1,10 +0,0 @@
--- a/subprojects/extensions-tool/meson.build
+++ a/subprojects/extensions-tool/meson.build
@@ -39,6 +39,6 @@ subdir('src')
if bash_completion.found()
install_data('completion/bash/gnome-extensions',
- install_dir: bash_completion.get_pkgconfig_variable('completionsdir')
+ install_dir: bash_completion.get_pkgconfig_variable('completionsdir', define_variable: ['prefix', prefix])
)
endif