Remove uses of mkFixStrictness

mkFixStrictness is no longer needed, woohoo!
This commit is contained in:
Eelco Dolstra 2013-10-28 01:14:16 +01:00
parent 0e333688ce
commit 4b1a9dd00b
4 changed files with 5 additions and 4 deletions

View file

@ -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 {

View file

@ -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

View file

@ -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}
'';

View file

@ -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";