diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2019-02-13 22:47:50 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2019-02-14 02:31:15 +0100 |
commit | 606ceda352de9830cc5e01c169571e742d88fb15 (patch) | |
tree | cbd513b0d2a7402d9aa9f83fa6c80597d2e55cb0 /pkgs/desktops/gnome-3/core/gnome-shell | |
parent | e27fa435f7dd15506e96ee6b794b447998e77997 (diff) | |
download | nixpkgs-606ceda352de9830cc5e01c169571e742d88fb15.tar nixpkgs-606ceda352de9830cc5e01c169571e742d88fb15.tar.gz nixpkgs-606ceda352de9830cc5e01c169571e742d88fb15.tar.bz2 nixpkgs-606ceda352de9830cc5e01c169571e742d88fb15.tar.lz nixpkgs-606ceda352de9830cc5e01c169571e742d88fb15.tar.xz nixpkgs-606ceda352de9830cc5e01c169571e742d88fb15.tar.zst nixpkgs-606ceda352de9830cc5e01c169571e742d88fb15.zip |
gnome3: stop using aliases
Diffstat (limited to 'pkgs/desktops/gnome-3/core/gnome-shell')
-rw-r--r-- | pkgs/desktops/gnome-3/core/gnome-shell/default.nix | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix index 76e5bd13522..693a3bec486 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -2,9 +2,10 @@ , python3Packages, 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 -, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, libgnomekbd -, sassc, systemd, gst_all_1 }: +, libpulseaudio, libical, gobject-introspection, gstreamer, wrapGAppsHook, libxslt, gcr, caribou +, 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 }: # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup @@ -26,16 +27,16 @@ in stdenv.mkDerivation rec { meson ninja pkgconfig gettext docbook_xsl docbook_xsl_ns docbook_xml_dtd_42 perl wrapGAppsHook glibcLocales sassc desktop-file-utils libxslt.bin ]; - buildInputs = with gnome3; [ + buildInputs = [ systemd caribou gsettings-desktop-schemas gnome-keyring glib gcr json-glib accountsservice libcroco libsecret libsoup polkit gdk_pixbuf librsvg clutter networkmanager libstartup_notification telepathy-glib libXtst gjs mutter libpulseaudio evolution-data-server - libical gtk gstreamer gdm libcanberra-gtk3 geoclue2 - defaultIconTheme gnome3.gnome-bluetooth - gnome3.gnome-clocks # schemas needed - at-spi2-core upower ibus gnome-desktop telepathy-logger gnome3.gnome-settings-daemon + libical gtk3 gstreamer gdm libcanberra-gtk3 geoclue2 + adwaita-icon-theme gnome-bluetooth + gnome-clocks # schemas needed + at-spi2-core upower ibus gnome-desktop telepathy-logger gnome-settings-daemon gst_all_1.gst-plugins-good # recording gobject-introspection @@ -45,7 +46,7 @@ in stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ # Needed to support on-screen keyboard used with touch screen devices # see https://github.com/NixOS/nixpkgs/issues/25968 - gnome3.caribou + caribou ]; patches = [ |