diff options
| author | José Romildo Malaquias <malaquias@gmail.com> | 2020-04-21 10:29:12 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-21 10:29:12 -0300 |
| commit | adcb685ec0640d1fe22dda47ad13b00eca94f33f (patch) | |
| tree | 1e523cbe2dab1348f2d4549f251e9c2520341a91 /pkgs/desktops/gnome-3/core | |
| parent | 4d92e1b32d6abf62b2eb97a8df2ad682daead525 (diff) | |
| parent | cf1a68360e934565da1cd9e15a5d7bf7c7a246e7 (diff) | |
| download | nixlib-adcb685ec0640d1fe22dda47ad13b00eca94f33f.tar nixlib-adcb685ec0640d1fe22dda47ad13b00eca94f33f.tar.gz nixlib-adcb685ec0640d1fe22dda47ad13b00eca94f33f.tar.bz2 nixlib-adcb685ec0640d1fe22dda47ad13b00eca94f33f.tar.lz nixlib-adcb685ec0640d1fe22dda47ad13b00eca94f33f.tar.xz nixlib-adcb685ec0640d1fe22dda47ad13b00eca94f33f.tar.zst nixlib-adcb685ec0640d1fe22dda47ad13b00eca94f33f.zip | |
Merge branch 'staging' into fix.icon-theme-inheritance
Diffstat (limited to 'pkgs/desktops/gnome-3/core')
| -rw-r--r-- | pkgs/desktops/gnome-3/core/epiphany/default.nix | 1 | ||||
| -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 |
3 files changed, 5 insertions, 11 deletions
diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix index 5ede0184d219..c41f5d79eb71 100644 --- a/pkgs/desktops/gnome-3/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix @@ -58,6 +58,7 @@ stdenv.mkDerivation rec { python3 wrapGAppsHook buildPackages.glib + buildPackages.gtk3 ]; buildInputs = [ 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 |