diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-28 01:14:16 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-28 22:45:55 +0100 |
| commit | 4b1a9dd00b508a3ea2273db916a600689d15f7f6 (patch) | |
| tree | a11b87c82d0a612bd058f31479cbb7e278a24044 | |
| parent | 0e333688cea468a28516bf6935648c03ed62a7bb (diff) | |
Remove uses of mkFixStrictness
mkFixStrictness is no longer needed, woohoo!
| -rw-r--r-- | lib/options.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/services/x11/display-managers/kdm.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/x11/display-managers/lightdm.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/system/boot/loader/grub/memtest.nix | 4 |
4 files changed, 5 insertions, 4 deletions
diff --git a/lib/options.nix b/lib/options.nix index 0fa702a616c62..0aed3619a7491 100644 --- a/lib/options.nix +++ b/lib/options.nix @@ -6,6 +6,7 @@ with import ./trivial.nix; with import ./lists.nix; with import ./misc.nix; with import ./attrsets.nix; +with import ./strings.nix; rec { diff --git a/nixos/modules/services/x11/display-managers/kdm.nix b/nixos/modules/services/x11/display-managers/kdm.nix index c03f711645415..2e84adcb4cefb 100644 --- a/nixos/modules/services/x11/display-managers/kdm.nix +++ b/nixos/modules/services/x11/display-managers/kdm.nix @@ -128,7 +128,7 @@ in services.xserver.displayManager.slim.enable = false; services.xserver.displayManager.job = - { execCmd = mkFixStrictness + { execCmd = '' mkdir -m 0755 -p /var/lib/kdm chown kdm /var/lib/kdm diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index f4fb5ee003a93..e4125891e6cbd 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -96,7 +96,7 @@ in logsXsession = true; # lightdm relaunches itself via just `lightdm`, so needs to be on the PATH - execCmd = mkFixStrictness '' + execCmd = '' export PATH=${lightdm}/sbin:$PATH ${lightdm}/sbin/lightdm --log-dir=/var/log --run-dir=/run --config=${lightdmConf} ''; diff --git a/nixos/modules/system/boot/loader/grub/memtest.nix b/nixos/modules/system/boot/loader/grub/memtest.nix index a0726c01e2043..80c1a160cfde4 100644 --- a/nixos/modules/system/boot/loader/grub/memtest.nix +++ b/nixos/modules/system/boot/loader/grub/memtest.nix @@ -23,7 +23,7 @@ in config = mkIf config.boot.loader.grub.memtest86 { - boot.loader.grub.extraEntries = mkFixStrictness ( + boot.loader.grub.extraEntries = if config.boot.loader.grub.version == 2 then '' menuentry "Memtest86+" { @@ -31,7 +31,7 @@ in } '' else - throw "Memtest86+ is not supported with GRUB 1."); + throw "Memtest86+ is not supported with GRUB 1."; boot.loader.grub.extraFiles."memtest.bin" = "${memtest86}/memtest.bin"; |