diff options
| author | Luca Bruno <lucabru@src.gnome.org> | 2014-09-23 14:01:25 +0200 |
|---|---|---|
| committer | Luca Bruno <lucabru@src.gnome.org> | 2014-09-23 14:01:25 +0200 |
| commit | 8ef7b83ca7a44ce733028ef985542ce06c54dd7d (patch) | |
| tree | 0fa7c8adeae7e6b539c8bd9068551c3a1e9c21dd /nixos | |
| parent | c1cf0b7dd5fccb16c8c470d8c766a050fd7a4a36 (diff) | |
| download | nixlib-8ef7b83ca7a44ce733028ef985542ce06c54dd7d.tar nixlib-8ef7b83ca7a44ce733028ef985542ce06c54dd7d.tar.gz nixlib-8ef7b83ca7a44ce733028ef985542ce06c54dd7d.tar.bz2 nixlib-8ef7b83ca7a44ce733028ef985542ce06c54dd7d.tar.lz nixlib-8ef7b83ca7a44ce733028ef985542ce06c54dd7d.tar.xz nixlib-8ef7b83ca7a44ce733028ef985542ce06c54dd7d.tar.zst nixlib-8ef7b83ca7a44ce733028ef985542ce06c54dd7d.zip | |
Fix nixos-rebuild evaluation
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/gnome3.nix | 3 | ||||
| -rw-r--r-- | nixos/modules/services/x11/display-managers/gdm.nix | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 3c13e866eb17..b045edcc7842 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -44,9 +44,10 @@ in { }; environment.gnome3.packageSet = mkOption { - default = pkgs.gnome3; + default = null; example = literalExample "pkgs.gnome3_10"; description = "Which Gnome 3 package set to use."; + apply = p: if p == null then pkgs.gnome3 else p; }; environment.gnome3.excludePackages = mkOption { diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index 9d14fc2e137c..080588df2472 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -5,8 +5,8 @@ with lib; let cfg = config.services.xserver.displayManager; - gdm = pkgs.gnome3_12.gdm; # gdm 3.10 not supported gnome3 = config.environment.gnome3.packageSet; + gdm = gnome3.gdm; in |