Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

nixos/sddm: allow disabling the rest of X11 #303114

Merged
merged 1 commit into from
Apr 10, 2024
Merged

Conversation

K900
Copy link
Contributor

@K900 K900 commented Apr 10, 2024

Description of changes

This should allow getting rid of all X dependencies on Wayland-only systems.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@alois31
Copy link
Contributor

alois31 commented Apr 10, 2024

Why add a new option instead of simply using services.xserver.enable?

@K900
Copy link
Contributor Author

K900 commented Apr 10, 2024

Valid.

@@ -66,7 +66,7 @@ let
HideShells = "/run/current-system/sw/bin/nologin";
};

X11 = {
X11 = optionalAttrs config.services.xserver.enable {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
X11 = optionalAttrs config.services.xserver.enable {
X11 = optionalAttrs xcfg.enable {

I had this change in my testing branch but probably forgot to carry it over to the PR.

@K900 K900 merged commit 85d3f97 into NixOS:master Apr 10, 2024
2 of 8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants