diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-04-13 19:28:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-13 19:28:56 +0200 |
| commit | 940c35568bc2fa135eafe0817027c765d9840469 (patch) | |
| tree | ed62e695955005464f85ffe60541c9f2d31cdfa3 /pkgs/desktops/gnome-3/core | |
| parent | b4a6714571724b1bdc99a6cbfdb9c45608ba1bf1 (diff) | |
| parent | bdb2bed66e5fe3015a0927514b2af593210e08a1 (diff) | |
| download | nixlib-940c35568bc2fa135eafe0817027c765d9840469.tar nixlib-940c35568bc2fa135eafe0817027c765d9840469.tar.gz nixlib-940c35568bc2fa135eafe0817027c765d9840469.tar.bz2 nixlib-940c35568bc2fa135eafe0817027c765d9840469.tar.lz nixlib-940c35568bc2fa135eafe0817027c765d9840469.tar.xz nixlib-940c35568bc2fa135eafe0817027c765d9840469.tar.zst nixlib-940c35568bc2fa135eafe0817027c765d9840469.zip | |
Merge pull request #84485 from xfix/bash-completion-update
bash-completion: 2.9 -> 2.10
Diffstat (limited to 'pkgs/desktops/gnome-3/core')
| -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 864dd45aad20..46a50c34556b 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 |