mirror/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-29 07:32:58 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

dconf-editor: Move from gnome scope to top-level

Browse Source
This commit is contained in:
Jan Tojnar 2024-06-22 15:58:30 +02:00
parent 23f2529ffc
commit 433464eb6a
5 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/services/x11/desktop-managers/gnome.nix
View File

@ -482,8 +482,8 @@ in
# Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/-/blob/3.38.0/elements/core/meta-gnome-core-developer-tools.bst
(lib.mkIf serviceCfg.core-developer-tools.enable {
environment.systemPackages = with pkgs.gnome; utils.removePackagesByName [
dconf-editor
environment.systemPackages = utils.removePackagesByName [
pkgs.dconf-editor
pkgs.devhelp
pkgs.gnome-builder
# boxes would make sense in this option, however

1
pkgs/desktops/gnome/core/dconf-editor/default.nix → pkgs/by-name/dc/dconf-editor/package.nix
View File

@ -65,7 +65,6 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
attrPath = "gnome.${pname}";
};
};

0
pkgs/desktops/gnome/core/dconf-editor/schema-override-variable.patch → pkgs/by-name/dc/dconf-editor/schema-override-variable.patch
View File

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

@ -22,8 +22,6 @@ in
caribou = callPackage ./core/caribou { };
dconf-editor = callPackage ./core/dconf-editor { };
gdm = callPackage ./core/gdm { };
gnome-backgrounds = callPackage ./core/gnome-backgrounds { };
@ -210,6 +208,7 @@ in
adwaita-icon-theme = lib.warn "The ‘gnome.adwaita-icon-theme’ was moved to top-level. Please use ‘pkgs.adwaita-icon-theme’ directly." pkgs.adwaita-icon-theme; # Added on 2024-06-22.
baobab = lib.warn "The ‘gnome.baobab’ was moved to top-level. Please use ‘pkgs.baobab’ directly." pkgs.baobab; # Added on 2024-06-22.
dconf-editor = lib.warn "The ‘gnome.dconf-editor’ was moved to top-level. Please use ‘pkgs.dconf-editor’ directly." pkgs.dconf-editor; # Added on 2024-06-22.
devhelp = lib.warn "The ‘gnome.devhelp’ was moved to top-level. Please use ‘pkgs.devhelp’ directly." pkgs.devhelp; # Added on 2024-06-22.
eog = lib.warn "The ‘gnome.eog’ was moved to top-level. Please use ‘pkgs.eog’ directly." pkgs.eog; # Added on 2024-06-22.
epiphany = lib.warn "The ‘gnome.epiphany’ was moved to top-level. Please use ‘pkgs.epiphany’ directly." pkgs.epiphany; # Added on 2024-06-22.

4
pkgs/desktops/mate/mate-panel/default.nix
View File

@ -5,7 +5,6 @@
, gettext
, itstool
, glib
, gnome
, gtk-layer-shell
, gtk3
, libmateweather
@ -13,6 +12,7 @@
, librsvg
, libxml2
, dconf
, dconf-editor
, mate-desktop
, mate-menus
, hicolor-icon-theme
@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
gtk3
# See https://github.com/mate-desktop/mate-panel/issues/1402
# This is propagated for mate_panel_applet_settings_new and applet's wrapGAppsHook3
gnome.dconf-editor
dconf-editor
];
# Needed for Wayland support.