summary refs log tree commit diff
path: root/nixos/modules/services/x11/display-managers/default.nix
diff options
context:
space:
mode:
authorJacek Galowicz <jacek@galowicz.de>2021-01-28 23:03:02 +0100
committerJacek Galowicz <jacek@galowicz.de>2021-01-28 23:49:05 +0100
commit001ba3934e329a457d26c4f45e666b2091c7dd80 (patch)
tree910af38979f5395d8d0039c2f2209da6e7941efc /nixos/modules/services/x11/display-managers/default.nix
parent123045a57056b997165be4963cbf62120a967fec (diff)
downloadnixpkgs-001ba3934e329a457d26c4f45e666b2091c7dd80.tar
nixpkgs-001ba3934e329a457d26c4f45e666b2091c7dd80.tar.gz
nixpkgs-001ba3934e329a457d26c4f45e666b2091c7dd80.tar.bz2
nixpkgs-001ba3934e329a457d26c4f45e666b2091c7dd80.tar.lz
nixpkgs-001ba3934e329a457d26c4f45e666b2091c7dd80.tar.xz
nixpkgs-001ba3934e329a457d26c4f45e666b2091c7dd80.tar.zst
nixpkgs-001ba3934e329a457d26c4f45e666b2091c7dd80.zip
Use lib.cartesianProducOfSets where lib.crossLists was used
Diffstat (limited to 'nixos/modules/services/x11/display-managers/default.nix')
-rw-r--r--nixos/modules/services/x11/display-managers/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index 6945a241f92..9fdbe753dad 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -444,8 +444,8 @@ in
       in
         # We will generate every possible pair of WM and DM.
         concatLists (
-          crossLists
-            (dm: wm: let
+            builtins.map
+            ({dm, wm}: let
               sessionName = "${dm.name}${optionalString (wm.name != "none") ("+" + wm.name)}";
               script = xsession dm wm;
               desktopNames = if dm ? desktopNames
@@ -472,7 +472,7 @@ in
                   providedSessions = [ sessionName ];
                 })
             )
-            [dms wms]
+            (cartesianProductOfSets { dm = dms; wm = wms; })
           );
 
     # Make xsessions and wayland sessions available in XDG_DATA_DIRS