public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix nixos-rebuild evaluation

Browse Source
This commit is contained in:
Luca Bruno 2014-09-23 14:01:25 +02:00
parent c1cf0b7dd5
commit 8ef7b83ca7
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nixos/modules/services/x11/desktop-managers/gnome3.nix
View File

@ -44,9 +44,10 @@ in {
}; };
environment.gnome3.packageSet = mkOption { environment.gnome3.packageSet = mkOption {
default = pkgs.gnome3; default = null;
example = literalExample "pkgs.gnome3_10"; example = literalExample "pkgs.gnome3_10";
description = "Which Gnome 3 package set to use."; description = "Which Gnome 3 package set to use.";
apply = p: if p == null then pkgs.gnome3 else p;
}; };
environment.gnome3.excludePackages = mkOption { environment.gnome3.excludePackages = mkOption {

2
nixos/modules/services/x11/display-managers/gdm.nix
View File

@ -5,8 +5,8 @@ with lib;
let let
cfg = config.services.xserver.displayManager; cfg = config.services.xserver.displayManager;
gdm = pkgs.gnome3_12.gdm; # gdm 3.10 not supported
gnome3 = config.environment.gnome3.packageSet; gnome3 = config.environment.gnome3.packageSet;
gdm = gnome3.gdm;
in in