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

Fix certain desktop managers building together #70041

Merged
merged 2 commits into from Oct 3, 2019

Conversation

worldofpeace
Copy link
Contributor

@worldofpeace worldofpeace commented Sep 30, 2019

Motivation for this change

Fixes #69208

Thanks @infinisil for being my rubber duck, turns out the basePackages internal option is void.

The only other error is

error: The unique option `services.gvfs.package' is defined multiple times, in:
 - /alt/nixpkgs-channels/nixos/modules/services/x11/desktop-managers/lxqt.nix
 - /alt/nixpkgs-channels/nixos/modules/services/x11/desktop-managers/xfce4-14.nix.

The is because we have these definitions:

# for xfce4-14
services.gvfs.package = pkgs.xfce.gvfs;

# for lxqt
services.gvfs.package = pkgs.gvfs;

In this case, I think it would make sense for pkgs.gvfs definition to win.
The xfce version just isn't built with samba, which TBH could be a defunct config at this point.

I'm in favor of backporting, this probably could have broken someone's multi-de setup.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @

@worldofpeace
Copy link
Contributor Author

It might be a good idea to have a test that makes sure certain desktop combinations can be built together. I didn't notice this because I wasn't testing that.

@ofborg ofborg bot added 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: nixos 6.topic: pantheon The Pantheon desktop environment 6.topic: xfce The Xfce Desktop Environment 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 0 labels Sep 30, 2019
After some thought, it doesn't make sense for this module to be shared.
This option in now completely useless.
All the default configs for these packages
already have GNOME features default,
@worldofpeace worldofpeace added this to the 19.09 milestone Sep 30, 2019
@worldofpeace worldofpeace merged commit 5edb205 into NixOS:master Oct 3, 2019
@worldofpeace worldofpeace deleted the desktopmanager-compat branch October 3, 2019 01:32
@worldofpeace
Copy link
Contributor Author

backported in ae35fe9 77b5a19

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: nixos 6.topic: pantheon The Pantheon desktop environment 6.topic: xfce The Xfce Desktop Environment 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

xfce4-14 cannot be enabled alongside some other desktop environemnts
1 participant