diff options
| author | Tor Hedin Brønner <torhedinbronner@gmail.com> | 2019-09-28 00:24:26 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-10-03 00:09:18 +0200 |
| commit | 34a76d40cd9ea624bdfc7df4b06d39545bd85c69 (patch) | |
| tree | 72a28b83e9b4b05fb02bc0ef25650d38aeb9a9cc /pkgs/desktops | |
| parent | dd86155fe4c372c3d524211f2a0839a4ce7d721f (diff) | |
| download | nixlib-34a76d40cd9ea624bdfc7df4b06d39545bd85c69.tar nixlib-34a76d40cd9ea624bdfc7df4b06d39545bd85c69.tar.gz nixlib-34a76d40cd9ea624bdfc7df4b06d39545bd85c69.tar.bz2 nixlib-34a76d40cd9ea624bdfc7df4b06d39545bd85c69.tar.lz nixlib-34a76d40cd9ea624bdfc7df4b06d39545bd85c69.tar.xz nixlib-34a76d40cd9ea624bdfc7df4b06d39545bd85c69.tar.zst nixlib-34a76d40cd9ea624bdfc7df4b06d39545bd85c69.zip | |
gnome3.gnome-shell: drop caribou
This should no longer be necessary as gnome-shell ships its own on-screen keyboard.
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/gnome-3/core/gnome-shell/default.nix | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix index abd467d2aa4d..57fa9c967ca6 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -2,7 +2,7 @@ , python3, libsoup, polkit, clutter, networkmanager, docbook_xsl , docbook_xsl_ns, at-spi2-core , libstartup_notification, telepathy-glib, telepathy-logger, libXtst, unzip, glibcLocales, shared-mime-info , libgweather, libcanberra-gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42, desktop-file-utils -, libpulseaudio, libical, gobject-introspection, gstreamer, wrapGAppsHook, libxslt, gcr, caribou +, libpulseaudio, libical, gobject-introspection, gstreamer, wrapGAppsHook, libxslt, gcr , accountsservice, gdk-pixbuf, gdm, upower, ibus, networkmanagerapplet, libgnomekbd, gnome-desktop , gsettings-desktop-schemas, gnome-keyring, glib, gjs, mutter, evolution-data-server, gtk3 , sassc, systemd, gst_all_1, adwaita-icon-theme, gnome-bluetooth, gnome-clocks, gnome-settings-daemon @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { sassc desktop-file-utils libxslt.bin python3 asciidoc-full ]; buildInputs = [ - systemd caribou + systemd gsettings-desktop-schemas gnome-keyring glib gcr json-glib accountsservice libcroco libsecret libsoup polkit gdk-pixbuf librsvg clutter networkmanager libstartup_notification telepathy-glib @@ -45,11 +45,6 @@ in stdenv.mkDerivation rec { # not declared at build time, but typelib is needed at runtime libgweather networkmanagerapplet ]; - propagatedUserEnvPkgs = [ - # Needed to support on-screen keyboard used with touch screen devices - # see https://github.com/NixOS/nixpkgs/issues/25968 - caribou - ]; patches = [ (fetchpatch { |