Author: eelco Date: 2010-07-05 14:33:11 +0000 (Mon, 05 Jul 2010) New Revision: 22479
You can view the changes in this commit at: https://svn.nixos.org/viewvc/nix?rev=22479&view=rev Modified: nixos/branches/boot-order/modules/services/x11/display-managers/kdm.nix Log: * Use config.system.build.grub rather than pkgs.grub to get the right GRUB when version 2 is enabled. Changes: Modified: nixos/branches/boot-order/modules/services/x11/display-managers/kdm.nix =================================================================== --- nixos/branches/boot-order/modules/services/x11/display-managers/kdm.nix 2010-07-05 14:20:54 UTC (rev 22478) +++ nixos/branches/boot-order/modules/services/x11/display-managers/kdm.nix 2010-07-05 14:33:11 UTC (rev 22479) @@ -94,7 +94,9 @@ config = mkIf cfg.enable { services.xserver.displayManager.job = - { execCmd = "PATH=${pkgs.grub}/sbin:$PATH exec ${kdebase_workspace}/bin/kdm -config ${kdmrc} -nodaemon"; + { execCmd = + (optionalString (config.system.boot.loader.id == "grub") "PATH=${config.system.build.grub}/sbin:$PATH ") + + "exec ${kdebase_workspace}/bin/kdm -config ${kdmrc} -nodaemon"; logsXsession = true; }; _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
