about summary refs log tree commit diff
path: root/nixos/modules/services
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@protonmail.ch>2019-07-24 16:44:25 -0400
committerGitHub <noreply@github.com>2019-07-24 16:44:25 -0400
commitaabb651b23969ea4c901914db6ca34eb2897f7a0 (patch)
treee32ec7b9fc0d5c72f743df08c7b910cd7eeb0059 /nixos/modules/services
parent23a3256ee1ece61eeb4e9a9a1fb6131b35e86abc (diff)
parent07bbae0bb721d84d8ffca4fef57e090130fe7c36 (diff)
downloadnixlib-aabb651b23969ea4c901914db6ca34eb2897f7a0.tar
nixlib-aabb651b23969ea4c901914db6ca34eb2897f7a0.tar.gz
nixlib-aabb651b23969ea4c901914db6ca34eb2897f7a0.tar.bz2
nixlib-aabb651b23969ea4c901914db6ca34eb2897f7a0.tar.lz
nixlib-aabb651b23969ea4c901914db6ca34eb2897f7a0.tar.xz
nixlib-aabb651b23969ea4c901914db6ca34eb2897f7a0.tar.zst
nixlib-aabb651b23969ea4c901914db6ca34eb2897f7a0.zip
Merge pull request #61876 from worldofpeace/gdk-pixbuf
gdk-pixbuf: rename from gdk_pixbuf
Diffstat (limited to 'nixos/modules/services')
-rw-r--r--nixos/modules/services/x11/gdk-pixbuf.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/services/x11/gdk-pixbuf.nix b/nixos/modules/services/x11/gdk-pixbuf.nix
index 2dc8eabd95a7..9ad926369ec7 100644
--- a/nixos/modules/services/x11/gdk-pixbuf.nix
+++ b/nixos/modules/services/x11/gdk-pixbuf.nix
@@ -5,21 +5,21 @@ with lib;
 let
   cfg = config.services.xserver.gdk-pixbuf;
 
-  # Get packages to generate the cache for. We always include gdk_pixbuf.
-  effectivePackages = unique ([pkgs.gdk_pixbuf] ++ cfg.modulePackages);
+  # Get packages to generate the cache for. We always include gdk-pixbuf.
+  effectivePackages = unique ([pkgs.gdk-pixbuf] ++ cfg.modulePackages);
 
   # Generate the cache file by running gdk-pixbuf-query-loaders for each
   # package and concatenating the results.
   loadersCache = pkgs.runCommand "gdk-pixbuf-loaders.cache" { preferLocalBuild = true; } ''
     (
       for package in ${concatStringsSep " " effectivePackages}; do
-        module_dir="$package/${pkgs.gdk_pixbuf.moduleDir}"
+        module_dir="$package/${pkgs.gdk-pixbuf.moduleDir}"
         if [[ ! -d $module_dir ]]; then
           echo "Warning (services.xserver.gdk-pixbuf): missing module directory $module_dir" 1>&2
           continue
         fi
         GDK_PIXBUF_MODULEDIR="$module_dir" \
-          ${pkgs.gdk_pixbuf.dev}/bin/gdk-pixbuf-query-loaders
+          ${pkgs.gdk-pixbuf.dev}/bin/gdk-pixbuf-query-loaders
       done
     ) > "$out"
   '';