diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-04-13 17:37:45 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-04-13 19:11:23 +0200 |
| commit | bdb2bed66e5fe3015a0927514b2af593210e08a1 (patch) | |
| tree | 07180b8792e8b2fdac519328655f9b59362b6a45 /pkgs/desktops | |
| parent | 0d120b1f2514c8f9698edc0a7680a2d4fd77b37c (diff) | |
| download | nixlib-bdb2bed66e5fe3015a0927514b2af593210e08a1.tar nixlib-bdb2bed66e5fe3015a0927514b2af593210e08a1.tar.gz nixlib-bdb2bed66e5fe3015a0927514b2af593210e08a1.tar.bz2 nixlib-bdb2bed66e5fe3015a0927514b2af593210e08a1.tar.lz nixlib-bdb2bed66e5fe3015a0927514b2af593210e08a1.tar.xz nixlib-bdb2bed66e5fe3015a0927514b2af593210e08a1.tar.zst nixlib-bdb2bed66e5fe3015a0927514b2af593210e08a1.zip | |
gnome3.gnome-shell: fix build with bash-completion 2.10
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/gnome-3/core/gnome-shell/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-3/core/gnome-shell/fix-bash-completion.patch | 10 |
2 files changed, 4 insertions, 11 deletions
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix index bcb72cb95b69..d75df9a55cfd 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -65,7 +65,10 @@ in stdenv.mkDerivation rec { # Install bash-completions to correct prefix. # 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 # aware of the location to hardcode in the generated GIR file. diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/fix-bash-completion.patch b/pkgs/desktops/gnome-3/core/gnome-shell/fix-bash-completion.patch deleted file mode 100644 index 08f674c23773..000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-shell/fix-bash-completion.patch +++ /dev/null @@ -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 |