diff options
| author | WORLDofPEACE <worldofpeace@protonmail.ch> | 2021-02-25 14:35:24 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-25 14:35:24 -0500 |
| commit | f49cd54c274e4b37e23f8bf0eb052238821eb186 (patch) | |
| tree | bc280929cc9c551bd287f7f0115f09ade920be37 /pkgs/desktops | |
| parent | ad007ce9263ffc69c38bdee4d645e65a1820551c (diff) | |
| parent | e9439e2ef3347dca51d094fc10acedbd5a638d2d (diff) | |
| download | nixpkgs-f49cd54c274e4b37e23f8bf0eb052238821eb186.tar nixpkgs-f49cd54c274e4b37e23f8bf0eb052238821eb186.tar.gz nixpkgs-f49cd54c274e4b37e23f8bf0eb052238821eb186.tar.bz2 nixpkgs-f49cd54c274e4b37e23f8bf0eb052238821eb186.tar.lz nixpkgs-f49cd54c274e4b37e23f8bf0eb052238821eb186.tar.xz nixpkgs-f49cd54c274e4b37e23f8bf0eb052238821eb186.tar.zst nixpkgs-f49cd54c274e4b37e23f8bf0eb052238821eb186.zip | |
Merge pull request #114002 from worldofpeace/fix-gcc-search-locations
gnome3.gnome-control-center: fix search locations dialog
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/gnome-3/core/gnome-control-center/default.nix | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix index 98d87dc09c8..603aaf1744b 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix @@ -58,6 +58,7 @@ , shared-mime-info , sound-theme-freedesktop , tracker +, tracker-miners , tzdata , udisks2 , upower @@ -75,6 +76,7 @@ stdenv.mkDerivation rec { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "09i011hf23s2i4wim43vjys7y4y43cxl3kyvrnrwqvqgc5n0144d"; }; + # See https://mail.gnome.org/archives/distributor-list/2020-September/msg00001.html prePatch = (import ../gvc-with-ucm-prePatch.nix { inherit fetchFromGitLab; @@ -100,6 +102,7 @@ stdenv.mkDerivation rec { clutter-gtk colord colord-gtk + epoxy fontconfig gdk-pixbuf glib @@ -121,6 +124,7 @@ stdenv.mkDerivation rec { libgudev libhandy libkrb5 + libnma libpulseaudio libpwquality librsvg @@ -131,13 +135,12 @@ stdenv.mkDerivation rec { modemmanager mutter # schemas for the keybindings networkmanager - libnma polkit samba tracker + tracker-miners # for search locations dialog udisks2 upower - epoxy ]; patches = [ @@ -159,6 +162,11 @@ stdenv.mkDerivation rec { url = "https://gitlab.gnome.org/GNOME/gnome-control-center/commit/64686cfee330849945f6ff4dcc43393eb1a6e59c.patch"; sha256 = "4VJU0q6qOtGzd/hmDncckInfEjCkC8+lXmDgxwc4VJU="; }) + # https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1173 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-control-center/-/commit/27e1140c9d4ad852b4dc6a132a14cd5532d52997.patch"; + sha256 = "nU3szjKfXpRek8hhsxiCJNgMeDeIRK3QVo82D9R+kL4="; + }) ]; postPatch = '' |