Unverified Commit 1acd9947 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

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

nixos/gdk-pixbuf: move out of xserver
parents 2a823de1 b939c540

nixos/modules/module-list.nix

+1 −1
Original line number Diff line number Diff line
@@ -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

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

+8 −4
Original line number Diff line number Diff line 
{ 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;

    };

  };

}

nixos/modules/services/desktop-managers/plasma6.nix

+1 −1
Original line number Diff line number Diff line
@@ -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 = {

nixos/modules/services/x11/desktop-managers/plasma5.nix

+1 −1
Original line number Diff line number Diff line
@@ -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 = {

nixos/modules/services/x11/desktop-managers/xfce.nix

+1 −1
Original line number Diff line number Diff line
@@ -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;