dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #308539 from SuperSandro2000/gdk-pixbuf-xserver

Browse Source 
nixos/gdk-pixbuf: move out of xserver
This commit is contained in:
Sandro 2024-06-09 02:08:30 +02:00 committed by GitHub
commit 1acd99478c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/module-list.nix
View File

@ -196,6 +196,7 @@
./programs/fzf.nix
./programs/gamemode.nix
./programs/gamescope.nix
./programs/gdk-pixbuf.nix
./programs/geary.nix
./programs/git.nix
./programs/gnome-disks.nix
@ -1497,7 +1498,6 @@
./services/x11/display-managers/xpra.nix
./services/x11/extra-layouts.nix
./services/x11/fractalart.nix
./services/x11/gdk-pixbuf.nix
./services/x11/hardware/cmt.nix
./services/x11/hardware/digimend.nix
./services/x11/hardware/synaptics.nix

12
nixos/modules/services/x11/gdk-pixbuf.nix → nixos/modules/programs/gdk-pixbuf.nix
View File

@ -1,16 +1,20 @@
{ config, lib, pkgs, ... }:
let
cfg = config.services.xserver.gdk-pixbuf;
cfg = config.programs.gdk-pixbuf;
loadersCache = pkgs.gnome._gdkPixbufCacheBuilder_DO_NOT_USE {
extraLoaders = lib.unique (cfg.modulePackages);
extraLoaders = lib.unique cfg.modulePackages;
};
in
{
imports = [
(lib.mkRenamedOptionModule [ "services" "xserver" "gdk-pixbuf" ] [ "programs" "gdk-pixbuf" ])
];
options = {
services.xserver.gdk-pixbuf.modulePackages = lib.mkOption {
programs.gdk-pixbuf.modulePackages = lib.mkOption {
type = lib.types.listOf lib.types.package;
default = [ ];
description = "Packages providing GDK-Pixbuf modules, for cache generation.";
@ -22,7 +26,7 @@ in
# GDK_PIXBUF_MODULE_FILE to point to it.
config = lib.mkIf (cfg.modulePackages != []) {
environment.sessionVariables = {
GDK_PIXBUF_MODULE_FILE = "${loadersCache}";
GDK_PIXBUF_MODULE_FILE = loadersCache;
};
};
}

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

@ -202,7 +202,7 @@ in {
environment.sessionVariables.KPACKAGE_DEP_RESOLVERS_PATH = "${kdePackages.frameworkintegration.out}/libexec/kf6/kpackagehandlers";
# Enable GTK applications to load SVG icons
services.xserver.gdk-pixbuf.modulePackages = [pkgs.librsvg];
programs.gdk-pixbuf.modulePackages = [pkgs.librsvg];
fonts.packages = [cfg.notoPackage pkgs.hack-font];
fonts.fontconfig.defaultFonts = {

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

@ -327,7 +327,7 @@ in
};
# Enable GTK applications to load SVG icons
services.xserver.gdk-pixbuf.modulePackages = [ pkgs.librsvg ];
programs.gdk-pixbuf.modulePackages = [ pkgs.librsvg ];
fonts.packages = with pkgs; [ cfg.notoPackage hack-font ];
fonts.fontconfig.defaultFonts = {

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

@ -153,7 +153,7 @@ in
}];
services.xserver.updateDbusEnvironment = true;
services.xserver.gdk-pixbuf.modulePackages = [ pkgs.librsvg ];
programs.gdk-pixbuf.modulePackages = [ pkgs.librsvg ];
# Enable helpful DBus services.
services.udisks2.enable = true;