From 606ceda352de9830cc5e01c169571e742d88fb15 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 13 Feb 2019 22:47:50 +0100 Subject: gnome3: stop using aliases --- pkgs/applications/misc/font-manager/default.nix | 2 +- pkgs/applications/misc/gnome-recipes/default.nix | 4 ++-- pkgs/applications/misc/gnome-usage/default.nix | 2 +- pkgs/applications/misc/gummi/default.nix | 2 +- pkgs/applications/misc/pcmanfm/default.nix | 2 +- pkgs/applications/misc/safeeyes/default.nix | 2 +- pkgs/applications/misc/tootle/default.nix | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) (limited to 'pkgs/applications/misc') diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix index bf97cff5030d..da5cf83c02c1 100644 --- a/pkgs/applications/misc/font-manager/default.nix +++ b/pkgs/applications/misc/font-manager/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { sqlite librsvg gnome3.gtk - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme ]; patches = [ ./correct-post-install.patch ]; diff --git a/pkgs/applications/misc/gnome-recipes/default.nix b/pkgs/applications/misc/gnome-recipes/default.nix index 154af4efc9b7..1cf6f547c30b 100644 --- a/pkgs/applications/misc/gnome-recipes/default.nix +++ b/pkgs/applications/misc/gnome-recipes/default.nix @@ -13,7 +13,7 @@ , glib , libsoup , gnome-online-accounts -, rest +, librest , json-glib , gnome-autoar , gspell @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { glib libsoup gnome-online-accounts - rest + librest json-glib gnome-autoar gspell diff --git a/pkgs/applications/misc/gnome-usage/default.nix b/pkgs/applications/misc/gnome-usage/default.nix index f5420a0c9449..724707d0be5f 100644 --- a/pkgs/applications/misc/gnome-usage/default.nix +++ b/pkgs/applications/misc/gnome-usage/default.nix @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig vala gettext libxml2 desktop-file-utils wrapGAppsHook ]; - buildInputs = [ glib gtk3 libgtop gnome3.defaultIconTheme ]; + buildInputs = [ glib gtk3 libgtop gnome3.adwaita-icon-theme ]; postPatch = '' chmod +x build-aux/meson/postinstall.sh diff --git a/pkgs/applications/misc/gummi/default.nix b/pkgs/applications/misc/gummi/default.nix index 6c84f3cbd326..1e237923d054 100644 --- a/pkgs/applications/misc/gummi/default.nix +++ b/pkgs/applications/misc/gummi/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ glib gnome2.gtksourceview gnome2.pango gtk2-x11 gtkspell2 poppler - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme ]; preConfigure = '' diff --git a/pkgs/applications/misc/pcmanfm/default.nix b/pkgs/applications/misc/pcmanfm/default.nix index 2649c7cbd6a9..633c1d82159a 100644 --- a/pkgs/applications/misc/pcmanfm/default.nix +++ b/pkgs/applications/misc/pcmanfm/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0mb8hg76x1z0szdyl0w7jpz0bdblc6a29is1vvnh79z37qxh8138"; }; - buildInputs = [ glib gtk libfm' libX11 pango gnome3.defaultIconTheme ]; + buildInputs = [ glib gtk libfm' libX11 pango gnome3.adwaita-icon-theme ]; nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool ]; configureFlags = optional withGtk3 "--with-gtk=3"; diff --git a/pkgs/applications/misc/safeeyes/default.nix b/pkgs/applications/misc/safeeyes/default.nix index deb456e53ed9..dfacdc75f1c5 100644 --- a/pkgs/applications/misc/safeeyes/default.nix +++ b/pkgs/applications/misc/safeeyes/default.nix @@ -17,7 +17,7 @@ in buildPythonApplication rec { buildInputs = [ gtk3 gobject-introspection - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme gnome3.adwaita-icon-theme ]; diff --git a/pkgs/applications/misc/tootle/default.nix b/pkgs/applications/misc/tootle/default.nix index 5a856a5f2b28..413f082fb22a 100644 --- a/pkgs/applications/misc/tootle/default.nix +++ b/pkgs/applications/misc/tootle/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub -, meson, ninja, pkgconfig, python3 +, meson, ninja, pkgconfig, python3, libgee, gsettings-desktop-schemas , gnome3, pantheon, gobject-introspection, wrapGAppsHook , gtk3, json-glib, glib, glib-networking, hicolor-icon-theme }: @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ gtk3 pantheon.granite json-glib glib glib-networking hicolor-icon-theme - gnome3.libgee gnome3.libsoup gnome3.gsettings-desktop-schemas + libgee gnome3.libsoup gsettings-desktop-schemas ]; postPatch = '' -- cgit 1.4.1