diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2024-06-22 14:43:05 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2024-07-01 08:26:46 +0200 |
commit | 5c5c20919b62ba182c68aaa713bd54f86a355a93 (patch) | |
tree | 21130b242f33a8a4146ab0669a8a2de710ceaf04 /pkgs/applications/office | |
parent | 545822250cb564c9360f7d86dc851fe153e18a45 (diff) |
adwaita-icon-theme: Move from gnome scope to top-level
It is widely used outside gnome – although it probably should not be.
Diffstat (limited to 'pkgs/applications/office')
-rw-r--r-- | pkgs/applications/office/endeavour/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/office/gnumeric/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/office/grisbi/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/office/homebank/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/office/libreoffice/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/office/paperwork/paperwork-gtk.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/office/tryton/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/office/zim/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/office/zotero/default.nix | 4 |
9 files changed, 20 insertions, 20 deletions
diff --git a/pkgs/applications/office/endeavour/default.nix b/pkgs/applications/office/endeavour/default.nix index 851eab538818d..806e024985772 100644 --- a/pkgs/applications/office/endeavour/default.nix +++ b/pkgs/applications/office/endeavour/default.nix @@ -6,7 +6,7 @@ , pkg-config , wrapGAppsHook4 , gettext -, gnome +, adwaita-icon-theme , glib , gtk4 , wayland @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { libpeas gnome-online-accounts gsettings-desktop-schemas - gnome.adwaita-icon-theme + adwaita-icon-theme # Plug-ins evolution-data-server-gtk4 # eds diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index d9b376a1962e7..74c9e571375fc 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, intltool, perlPackages -, goffice, gnome, wrapGAppsHook3, gtk3, bison, python3Packages +, goffice, gnome, adwaita-icon-theme, wrapGAppsHook3, gtk3, bison, python3Packages , itstool }: @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { # ToDo: optional libgda, introspection? buildInputs = [ - goffice gtk3 gnome.adwaita-icon-theme + goffice gtk3 adwaita-icon-theme python pygobject3 ] ++ (with perlPackages; [ perl XMLParser ]); diff --git a/pkgs/applications/office/grisbi/default.nix b/pkgs/applications/office/grisbi/default.nix index 846b4180625ab..911ed9715320d 100644 --- a/pkgs/applications/office/grisbi/default.nix +++ b/pkgs/applications/office/grisbi/default.nix @@ -7,7 +7,7 @@ , intltool , wrapGAppsHook3 , libsoup -, gnome +, adwaita-icon-theme }: stdenv.mkDerivation rec { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { libgsf libofx libsoup - gnome.adwaita-icon-theme + adwaita-icon-theme ]; meta = with lib; { diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 000942ff68bdd..5c21eeb721408 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -1,5 +1,5 @@ { fetchurl, lib, stdenv, gtk, pkg-config, libofx, intltool, wrapGAppsHook3 -, libsoup_3, gnome }: +, libsoup_3, adwaita-icon-theme }: stdenv.mkDerivation rec { pname = "homebank"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ pkg-config wrapGAppsHook3 intltool ]; - buildInputs = [ gtk libofx libsoup_3 gnome.adwaita-icon-theme]; + buildInputs = [ gtk libofx libsoup_3 adwaita-icon-theme]; meta = with lib; { description = "Free, easy, personal accounting for everyone"; diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index d679b168e24ff..30e5f7864cd03 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -86,7 +86,7 @@ , glm , gst_all_1 , gdb -, gnome +, adwaita-icon-theme , glib , ncurses , libepoxy @@ -311,7 +311,7 @@ in stdenv.mkDerivation (finalAttrs: { gettext glib glm - gnome.adwaita-icon-theme + adwaita-icon-theme gperf gpgme graphite2 diff --git a/pkgs/applications/office/paperwork/paperwork-gtk.nix b/pkgs/applications/office/paperwork/paperwork-gtk.nix index 2393ac0ece553..c9b9efeba8906 100644 --- a/pkgs/applications/office/paperwork/paperwork-gtk.nix +++ b/pkgs/applications/office/paperwork/paperwork-gtk.nix @@ -2,7 +2,7 @@ , python3Packages , gtk3 , cairo -, gnome +, adwaita-icon-theme , librsvg , xvfb-run , dbus @@ -69,7 +69,7 @@ python3Packages.buildPythonApplication rec { ln -s $i $site/icon/out; done - export XDG_DATA_DIRS=$XDG_DATA_DIRS:${gnome.adwaita-icon-theme}/share + export XDG_DATA_DIRS=$XDG_DATA_DIRS:${adwaita-icon-theme}/share # build the user manual PATH=$out/bin:$PATH PAPERWORK_TEST_DOCUMENTS=${sample_docs} make data for i in src/paperwork_gtk/model/help/out/*.pdf; do @@ -89,7 +89,7 @@ python3Packages.buildPythonApplication rec { ] ++ documentation_deps; buildInputs = [ - gnome.adwaita-icon-theme + adwaita-icon-theme libnotify librsvg gtk3 diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/applications/office/tryton/default.nix index 27d50caedde05..d2db214a4ef88 100644 --- a/pkgs/applications/office/tryton/default.nix +++ b/pkgs/applications/office/tryton/default.nix @@ -7,7 +7,7 @@ , atk , gtk3 , gtkspell3 -, gnome +, adwaita-icon-theme , glib , goocanvas2 , gdk-pixbuf @@ -47,7 +47,7 @@ python3Packages.buildPythonApplication rec { atk gdk-pixbuf glib - gnome.adwaita-icon-theme + adwaita-icon-theme goocanvas2 fontconfig freetype diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix index 98d83f53f2d33..0f4017dbbc07c 100644 --- a/pkgs/applications/office/zim/default.nix +++ b/pkgs/applications/office/zim/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python3Packages, gtk3, gobject-introspection, wrapGAppsHook3, gnome }: +{ lib, stdenv, fetchurl, python3Packages, gtk3, gobject-introspection, wrapGAppsHook3, adwaita-icon-theme }: # TODO: Declare configuration options for the following optional dependencies: # - File stores: hg, git, bzr @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { hash = "sha256-QIkNsFsWeNHEcXhGHHZyJDMMW2lNvdwMJLGxeCZaLdI="; }; - buildInputs = [ gtk3 gnome.adwaita-icon-theme ]; + buildInputs = [ gtk3 adwaita-icon-theme ]; propagatedBuildInputs = with python3Packages; [ pyxdg pygobject3 ]; nativeBuildInputs = [ gobject-introspection wrapGAppsHook3 ]; @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { preFixup = '' makeWrapperArgs+=(--prefix XDG_DATA_DIRS : $out/share) - makeWrapperArgs+=(--prefix XDG_DATA_DIRS : ${gnome.adwaita-icon-theme}/share) + makeWrapperArgs+=(--prefix XDG_DATA_DIRS : ${adwaita-icon-theme}/share) makeWrapperArgs+=(--argv0 $out/bin/.zim-wrapped) makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index b31ce7f8c2de7..78a335a1b907c 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -30,7 +30,7 @@ , libXrender , libXt , libnotify -, gnome +, adwaita-icon-theme , libGLU , libGL , nspr @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ wrapGAppsHook3 ]; buildInputs = - [ gsettings-desktop-schemas glib gtk3 gnome.adwaita-icon-theme dconf ]; + [ gsettings-desktop-schemas glib gtk3 adwaita-icon-theme dconf ]; dontConfigure = true; dontBuild = true; |