summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorSilvan Mosberger <infinisil@icloud.com>2018-07-18 22:04:26 +0200
committerSilvan Mosberger <infinisil@icloud.com>2018-07-18 22:04:26 +0200
commit35c069ea02b6a19263cd66c2885f4d8190a7c910 (patch)
treed21a9582c79cc0050eb0d1461593e9b6ec3fafc4 /nixos
parent4884f58f4e49b051f5fe6d78159486cdef5ee703 (diff)
downloadnixlib-35c069ea02b6a19263cd66c2885f4d8190a7c910.tar
nixlib-35c069ea02b6a19263cd66c2885f4d8190a7c910.tar.gz
nixlib-35c069ea02b6a19263cd66c2885f4d8190a7c910.tar.bz2
nixlib-35c069ea02b6a19263cd66c2885f4d8190a7c910.tar.lz
nixlib-35c069ea02b6a19263cd66c2885f4d8190a7c910.tar.xz
nixlib-35c069ea02b6a19263cd66c2885f4d8190a7c910.tar.zst
nixlib-35c069ea02b6a19263cd66c2885f4d8190a7c910.zip
nixos: systemd.globalEnvironment: fix type
Follow up fix of fb2a8d66699c96d6a687eb71ebfcca08e3405037

https://github.com/NixOS/nixpkgs/pull/38356
https://github.com/NixOS/nixpkgs/pull/40416
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/system/boot/systemd.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 6593b1a02430..6f5b15372d75 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -515,7 +515,7 @@ in
     };
 
     systemd.globalEnvironment = mkOption {
-      type = with types; attrsOf (nullOr (either str package));
+      type = with types; attrsOf (nullOr (either str (either path package)));
       default = {};
       example = { TZ = "CET"; };
       description = ''