diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2017-09-24 13:15:50 +0200 |
|---|---|---|
| committer | zimbatm <zimbatm@zimbatm.com> | 2017-09-24 12:15:50 +0100 |
| commit | 69698ec11cc0619d84b14764fa9e708fe7e7223c (patch) | |
| tree | 9d9f602554b497a3265caf5e2ef4821e12736686 /nixos/modules/services/desktops/gnome3/gnome-user-share.nix | |
| parent | 23b19efdc9c8d64177cefcaa5b919db966bb8f5e (diff) | |
| download | nixpkgs-69698ec11cc0619d84b14764fa9e708fe7e7223c.tar nixpkgs-69698ec11cc0619d84b14764fa9e708fe7e7223c.tar.gz nixpkgs-69698ec11cc0619d84b14764fa9e708fe7e7223c.tar.bz2 nixpkgs-69698ec11cc0619d84b14764fa9e708fe7e7223c.tar.lz nixpkgs-69698ec11cc0619d84b14764fa9e708fe7e7223c.tar.xz nixpkgs-69698ec11cc0619d84b14764fa9e708fe7e7223c.tar.zst nixpkgs-69698ec11cc0619d84b14764fa9e708fe7e7223c.zip | |
gnome3: only maintain single GNOME 3 package set (#29397)
* gnome3: only maintain single GNOME 3 package set GNOME 3 was split into 3.10 and 3.12 in #2694. Unfortunately, we barely have the resources to update a single version of GNOME. Maintaining multiple versions just does not make sense. Additionally, it makes viewing history using most Git tools bothersome. This commit renames `pkgs/desktops/gnome-3/3.24` to `pkgs/desktops/gnome-3`, removes the config variable for choosing packageset (`environment.gnome3.packageSet`), updates the hint in maintainer script, and removes the `gnome3_24` derivation from `all-packages.nix`. Closes: #29329 * maintainers/scripts/gnome: Use fixed GNOME 3 directory Since we now allow only a single GNOME 3 package set, specifying the working directory is not necessary. This commit sets the directory to `pkgs/desktops/gnome-3`.
Diffstat (limited to 'nixos/modules/services/desktops/gnome3/gnome-user-share.nix')
| -rw-r--r-- | nixos/modules/services/desktops/gnome3/gnome-user-share.nix | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/nixos/modules/services/desktops/gnome3/gnome-user-share.nix b/nixos/modules/services/desktops/gnome3/gnome-user-share.nix index e5c94cff7c8..1f6ce2ae968 100644 --- a/nixos/modules/services/desktops/gnome3/gnome-user-share.nix +++ b/nixos/modules/services/desktops/gnome3/gnome-user-share.nix @@ -4,9 +4,6 @@ with lib; -let - gnome3 = config.environment.gnome3.packageSet; -in { ###### interface @@ -33,9 +30,9 @@ in config = mkIf config.services.gnome3.gnome-user-share.enable { - environment.systemPackages = [ gnome3.gnome-user-share ]; + environment.systemPackages = [ pkgs.gnome3.gnome-user-share ]; - services.xserver.displayManager.sessionCommands = with gnome3; '' + services.xserver.displayManager.sessionCommands = with pkgs.gnome3; '' # Don't let gnome-control-center depend upon gnome-user-share export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${gnome-user-share}/share/gsettings-schemas/${gnome-user-share.name} ''; |