Skip to content

Fix wingpanel and switchboard #83265

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 2 commits into from
Mar 24, 2020
Merged

Fix wingpanel and switchboard #83265

merged 2 commits into from
Mar 24, 2020
+54 −19

Conversation

worldofpeace
Copy link
Contributor

Motivation for this change

See https://hydra.nixos.org/build/115171133/download/1/screen.png and commit messages.
I'm going to fix my test that should be checking if wingpanel is running (and it's also weird that it doesn't kill the session when wingpanel crashes, perhaps when they replace cerbere completely this will go away)

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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.

Sorry, something went wrong.

@ofborg ofborg bot added 6.topic: pantheon The Pantheon desktop environment 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Mar 24, 2020
@worldofpeace
pantheon.wingpanel-with-indicators: fix wrapping
db41c78 
Since NixOS#81475 this caused the wrapper to be empty of entries from
wrapGAppsHook because the wrapGAppsHook function doesn't add
them anymore, and was moved to gappsWrapperArgsHook. Instead
of just running that in postBuild it's more future proof to make this
use stdenv.mkDerivation because we want to mess around with the
generic builder.
@worldofpeace
pantheon.switchboard-with-plugs: fix wrapping
a9e7e93 
Since NixOS#81475 this caused the wrapper to be empty of entries from
wrapGAppsHook because the wrapGAppsHook function doesn't add
them anymore, and was moved to gappsWrapperArgsHook. Instead
of just running that in postBuild it's more future proof to make this
use stdenv.mkDerivation because we want to mess around with the
generic builder.
@worldofpeace worldofpeace force-pushed the fix-wingpanel-and-switchboard branch from 034b962 to a9e7e93 Compare March 24, 2020 07:13
@worldofpeace worldofpeace merged commit 5a10c51 into NixOS:master Mar 24, 2020
@worldofpeace worldofpeace deleted the fix-wingpanel-and-switchboard branch March 24, 2020 07:13
@worldofpeace
Copy link
Contributor Author

backported to 20.03 in 1217a6c b85f4d0

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jtojnar jtojnar

Assignees
No one assigned
Labels
6.topic: pantheon The Pantheon desktop environment 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@worldofpeace @jtojnar