public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gnome3.gnome-shell: drop caribou 

This should no longer be necessary as gnome-shell ships its own on-screen
keyboard.
This commit is contained in:
Tor Hedin Brønner 2019-09-28 00:24:26 +02:00 committed by Jan Tojnar
parent dd86155fe4
commit 34a76d40cd
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/desktops/gnome-3/core/gnome-shell/default.nix
View File

@ -2,7 +2,7 @@
, python3, libsoup, polkit, clutter, networkmanager, docbook_xsl , docbook_xsl_ns, at-spi2-core , 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 , 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 , 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 , accountsservice, gdk-pixbuf, gdm, upower, ibus, networkmanagerapplet, libgnomekbd, gnome-desktop
, gsettings-desktop-schemas, gnome-keyring, glib, gjs, mutter, evolution-data-server, gtk3 , 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 , 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 sassc desktop-file-utils libxslt.bin python3 asciidoc-full
]; ];
buildInputs = [ buildInputs = [
systemd caribou systemd
gsettings-desktop-schemas gnome-keyring glib gcr json-glib accountsservice gsettings-desktop-schemas gnome-keyring glib gcr json-glib accountsservice
libcroco libsecret libsoup polkit gdk-pixbuf librsvg libcroco libsecret libsoup polkit gdk-pixbuf librsvg
clutter networkmanager libstartup_notification telepathy-glib 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 # not declared at build time, but typelib is needed at runtime
libgweather networkmanagerapplet libgweather networkmanagerapplet
]; ];
propagatedUserEnvPkgs = [
# Needed to support on-screen keyboard used with touch screen devices
# see https://github.com/NixOS/nixpkgs/issues/25968
caribou
];
patches = [ patches = [
(fetchpatch { (fetchpatch {