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

gnome-themes-extra: Move from gnome scope to top-level

Browse Source 
Upstream archived.
This commit is contained in:
Jan Tojnar 2024-06-22 16:16:42 +02:00
parent 6d725135fe
commit e3a06d65ff
16 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/x11/desktop-managers/cinnamon.nix
View File

@ -164,7 +164,7 @@ in
# theme # theme
adwaita-icon-theme adwaita-icon-theme
gnome.gnome-themes-extra gnome-themes-extra
gtk3.out gtk3.out
# other # other

2
nixos/modules/services/x11/desktop-managers/xfce.nix
View File

@ -84,7 +84,7 @@ in
glib # for gsettings glib # for gsettings
gtk3.out # gtk-update-icon-cache gtk3.out # gtk-update-icon-cache
gnome.gnome-themes-extra gnome-themes-extra
adwaita-icon-theme adwaita-icon-theme
hicolor-icon-theme hicolor-icon-theme
tango-icon-theme tango-icon-theme

4
nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix
View File

@ -34,8 +34,8 @@ in {
theme = { theme = {
package = mkOption { package = mkOption {
type = types.package; type = types.package;
default = pkgs.gnome.gnome-themes-extra; default = pkgs.gnome-themes-extra;
defaultText = literalExpression "pkgs.gnome.gnome-themes-extra"; defaultText = literalExpression "pkgs.gnome-themes-extra";
description = '' description = ''
The package path that contains the theme given in the name option. The package path that contains the theme given in the name option.
''; '';

4
nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix
View File

@ -47,8 +47,8 @@ in
package = mkOption { package = mkOption {
type = types.package; type = types.package;
default = pkgs.gnome.gnome-themes-extra; default = pkgs.gnome-themes-extra;
defaultText = literalExpression "pkgs.gnome.gnome-themes-extra"; defaultText = literalExpression "pkgs.gnome-themes-extra";
description = '' description = ''
The package path that contains the theme given in the name option. The package path that contains the theme given in the name option.
''; '';

4
nixos/modules/services/x11/display-managers/lightdm-greeters/slick.nix
View File

@ -33,8 +33,8 @@ in
theme = { theme = {
package = mkOption { package = mkOption {
type = types.package; type = types.package;
default = pkgs.gnome.gnome-themes-extra; default = pkgs.gnome-themes-extra;
defaultText = literalExpression "pkgs.gnome.gnome-themes-extra"; defaultText = literalExpression "pkgs.gnome-themes-extra";
description = '' description = ''
The package path that contains the theme given in the name option. The package path that contains the theme given in the name option.
''; '';

4
pkgs/applications/graphics/gimp/wrapper.nix
View File

@ -1,4 +1,4 @@
{ lib, symlinkJoin, makeWrapper, gimpPlugins, gnome, plugins ? null}: { lib, symlinkJoin, makeWrapper, gimpPlugins, gnome-themes-extra, plugins ? null}:
let let
inherit (gimpPlugins) gimp; inherit (gimpPlugins) gimp;
@ -19,7 +19,7 @@ in symlinkJoin {
wrapProgram $out/bin/$each \ wrapProgram $out/bin/$each \
--set GIMP2_PLUGINDIR "$out/lib/gimp/2.0" \ --set GIMP2_PLUGINDIR "$out/lib/gimp/2.0" \
--set GIMP2_DATADIR "$out/share/gimp/2.0" \ --set GIMP2_DATADIR "$out/share/gimp/2.0" \
--prefix GTK_PATH : "${gnome.gnome-themes-extra}/lib/gtk-2.0" \ --prefix GTK_PATH : "${gnome-themes-extra}/lib/gtk-2.0" \
${toString extraArgs} ${toString extraArgs}
done done
set +x set +x

0
pkgs/desktops/gnome/core/gnome-themes-extra/default.nix → pkgs/by-name/gn/gnome-themes-extra/package.nix
View File

4
pkgs/by-name/tu/tuifimanager/package.nix
View File

@ -3,7 +3,7 @@
, python3 , python3
, fetchFromGitHub , fetchFromGitHub
, kdePackages , kdePackages
, gnome , gnome-themes-extra
, qt6 , qt6
, makeWrapper , makeWrapper
, x11Support ? stdenv.isLinux , x11Support ? stdenv.isLinux
@ -52,7 +52,7 @@ python3.pkgs.buildPythonApplication rec {
postFixup = let postFixup = let
# fix missing 'adwaita' warning missing with ncurses tui # fix missing 'adwaita' warning missing with ncurses tui
# see: https://github.com/NixOS/nixpkgs/issues/60918 # see: https://github.com/NixOS/nixpkgs/issues/60918
theme = gnome.gnome-themes-extra; theme = gnome-themes-extra;
in in
lib.optionalString enableDragAndDrop '' lib.optionalString enableDragAndDrop ''
wrapProgram $out/bin/tuifi \ wrapProgram $out/bin/tuifi \

3
pkgs/data/themes/arc/default.nix
View File

@ -5,6 +5,7 @@
, ninja , ninja
, glib , glib
, gnome , gnome
, gnome-themes-extra
, gtk-engine-murrine , gtk-engine-murrine
, inkscape , inkscape
, cinnamon , cinnamon
@ -33,7 +34,7 @@ stdenv.mkDerivation rec {
]; ];
propagatedUserEnvPkgs = [ propagatedUserEnvPkgs = [
gnome.gnome-themes-extra gnome-themes-extra
gtk-engine-murrine gtk-engine-murrine
]; ];

3
pkgs/data/themes/ayu-theme-gtk/default.nix
View File

@ -2,6 +2,7 @@
, autoreconfHook , autoreconfHook
, fetchFromGitHub , fetchFromGitHub
, gnome , gnome
, gnome-themes-extra
, gtk-engine-murrine , gtk-engine-murrine
, gtk3 , gtk3
, inkscape , inkscape
@ -37,7 +38,7 @@ stdenv.mkDerivation rec {
]; ];
propagatedUserEnvPkgs = [ propagatedUserEnvPkgs = [
gnome.gnome-themes-extra gnome-themes-extra
gtk-engine-murrine gtk-engine-murrine
]; ];

4
pkgs/data/themes/equilux-theme/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, gnome, glib, libxml2, gtk-engine-murrine, gdk-pixbuf, librsvg, bc }: { lib, stdenv, fetchFromGitHub, gnome, gnome-themes-extra, glib, libxml2, gtk-engine-murrine, gdk-pixbuf, librsvg, bc }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "equilux-theme"; pname = "equilux-theme";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ glib libxml2 bc ]; nativeBuildInputs = [ glib libxml2 bc ];
buildInputs = [ gnome.gnome-themes-extra gdk-pixbuf librsvg ]; buildInputs = [ gnome-themes-extra gdk-pixbuf librsvg ];
propagatedUserEnvPkgs = [ gtk-engine-murrine ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ];

3
pkgs/data/themes/materia-theme/default.nix
View File

@ -5,6 +5,7 @@
, ninja , ninja
, sassc , sassc
, gnome , gnome
, gnome-themes-extra
, gtk-engine-murrine , gtk-engine-murrine
, gdk-pixbuf , gdk-pixbuf
, librsvg , librsvg
@ -23,7 +24,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja sassc ]; nativeBuildInputs = [ meson ninja sassc ];
buildInputs = [ gnome.gnome-themes-extra gdk-pixbuf librsvg ]; buildInputs = [ gnome-themes-extra gdk-pixbuf librsvg ];
propagatedUserEnvPkgs = [ gtk-engine-murrine ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ];

4
pkgs/data/themes/yaru-remix/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, meson, sassc, pkg-config, glib, ninja, python3, gtk3, gnome }: { lib, stdenv, fetchFromGitHub, meson, sassc, pkg-config, glib, ninja, python3, gtk3, gnome, gnome-themes-extra }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "yaru-remix"; pname = "yaru-remix";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ]; nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ];
buildInputs = [ gtk3 gnome.gnome-themes-extra ]; buildInputs = [ gtk3 gnome-themes-extra ];
dontDropIconThemeCache = true; dontDropIconThemeCache = true;

4
pkgs/data/themes/yaru/default.nix
View File

@ -8,7 +8,7 @@
, ninja , ninja
, python3 , python3
, gtk3 , gtk3
, gnome , gnome-themes-extra
, gtk-engine-murrine , gtk-engine-murrine
, humanity-icon-theme , humanity-icon-theme
, hicolor-icon-theme , hicolor-icon-theme
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ]; nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ];
buildInputs = [ gtk3 gnome.gnome-themes-extra ]; buildInputs = [ gtk3 gnome-themes-extra ];
propagatedBuildInputs = [ humanity-icon-theme hicolor-icon-theme ]; propagatedBuildInputs = [ humanity-icon-theme hicolor-icon-theme ];
propagatedUserEnvPkgs = [ gtk-engine-murrine ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ];

3
pkgs/desktops/gnome/default.nix
View File

@ -63,8 +63,6 @@ in
gnome-software = callPackage ./core/gnome-software { }; gnome-software = callPackage ./core/gnome-software { };
gnome-themes-extra = callPackage ./core/gnome-themes-extra { };
gvfs = pkgs.gvfs.override { gnomeSupport = true; }; gvfs = pkgs.gvfs.override { gnomeSupport = true; };
mutter = callPackage ./core/mutter { }; mutter = callPackage ./core/mutter { };
@ -216,6 +214,7 @@ in
gnome-screenshot = lib.warn "The ‘gnome.gnome-screenshot’ was moved to top-level. Please use ‘pkgs.gnome-screenshot’ directly." pkgs.gnome-screenshot; # Added on 2024-06-22. gnome-screenshot = lib.warn "The ‘gnome.gnome-screenshot’ was moved to top-level. Please use ‘pkgs.gnome-screenshot’ directly." pkgs.gnome-screenshot; # Added on 2024-06-22.
gnome-system-monitor = lib.warn "The ‘gnome.gnome-system-monitor’ was moved to top-level. Please use ‘pkgs.gnome-system-monitor’ directly." pkgs.gnome-system-monitor; # Added on 2024-06-22. gnome-system-monitor = lib.warn "The ‘gnome.gnome-system-monitor’ was moved to top-level. Please use ‘pkgs.gnome-system-monitor’ directly." pkgs.gnome-system-monitor; # Added on 2024-06-22.
gnome-terminal = lib.warn "The ‘gnome.gnome-terminal’ was moved to top-level. Please use ‘pkgs.gnome-terminal’ directly." pkgs.gnome-terminal; # Added on 2024-06-13. gnome-terminal = lib.warn "The ‘gnome.gnome-terminal’ was moved to top-level. Please use ‘pkgs.gnome-terminal’ directly." pkgs.gnome-terminal; # Added on 2024-06-13.
gnome-themes-extra = lib.warn "The ‘gnome.gnome-themes-extra’ was moved to top-level. Please use ‘pkgs.gnome-themes-extra’ directly." pkgs.gnome-themes-extra; # Added on 2024-06-22.
gnome-user-share = lib.warn "The ‘gnome.gnome-user-share’ was moved to top-level. Please use ‘pkgs.gnome-user-share’ directly." pkgs.gnome-user-share; # Added on 2024-06-13. gnome-user-share = lib.warn "The ‘gnome.gnome-user-share’ was moved to top-level. Please use ‘pkgs.gnome-user-share’ directly." pkgs.gnome-user-share; # Added on 2024-06-13.
gpaste = lib.warn "The ‘gnome.gpaste’ was moved to top-level. Please use ‘pkgs.gpaste’ directly." pkgs.gpaste; # Added on 2024-06-22. gpaste = lib.warn "The ‘gnome.gpaste’ was moved to top-level. Please use ‘pkgs.gpaste’ directly." pkgs.gpaste; # Added on 2024-06-22.
gucharmap = lib.warn "The ‘gnome.gucharmap’ was moved to top-level. Please use ‘pkgs.gucharmap’ directly." pkgs.gucharmap; # Added on 2024-06-22. gucharmap = lib.warn "The ‘gnome.gucharmap’ was moved to top-level. Please use ‘pkgs.gucharmap’ directly." pkgs.gucharmap; # Added on 2024-06-22.

2
pkgs/top-level/all-packages.nix
View File

@ -37430,8 +37430,6 @@ with pkgs;
latte-dock = libsForQt5.callPackage ../applications/misc/latte-dock { }; latte-dock = libsForQt5.callPackage ../applications/misc/latte-dock { };
gnome-themes-extra = gnome.gnome-themes-extra;
xrandr-invert-colors = callPackage ../applications/misc/xrandr-invert-colors { }; xrandr-invert-colors = callPackage ../applications/misc/xrandr-invert-colors { };
### SCIENCE/CHEMISTY ### SCIENCE/CHEMISTY