gnome3: stop using aliases

2019-02-14 02:31:15 +01:00
parent e27fa435f7
commit 606ceda352
179 changed files with 464 additions and 447 deletions
@@ -1,5 +1,6 @@
 { fetchurl, fetchgit, substituteAll, stdenv, meson, ninja, pkgconfig, gnome3, perl, gettext, glib, libnotify, lcms2, libXtst
 , libxkbfile, libpulseaudio, alsaLib, libcanberra-gtk3, upower, colord, libgweather, polkit
+, geocode-glib, gtk3
 , geoclue2, librsvg, xf86_input_wacom, udev, libgudev, libwacom, libxslt, libxml2, networkmanager
 , docbook_xsl, wrapGAppsHook, python3, ibus, xkeyboard_config, tzdata, nss, pantheon, accountsservice }:

@@ -75,16 +76,16 @@ stdenv.mkDerivation rec {
    wrapGAppsHook
  ];

-  buildInputs = with gnome3; [
+  buildInputs = [
    accountsservice
    alsaLib
    colord
    geoclue2
    geocode-glib
    glib
-    gnome-desktop
-    gsettings-desktop-schemas
-    gtk
+    gnome3.gnome-desktop
+    gnome3.gsettings-desktop-schemas
+    gtk3
    ibus
    lcms2
    libXtst