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

phoebus-client: hardcode Python path for the console view #120

Merged

Conversation

minijackson
Copy link
Collaborator

Upstream defaults to /usr/bin/python3, which doesn't exist on NixOS

Fixes #100

And some minor cleanup

Upstream defaults to /usr/bin/python3, which doesn't exist on NixOS

Fixes epics-extensions#100
Reading through the spec[1] and the warnings,
it says that an application should have only one "Main Category"
to prevent the application to be displayed in multiple places in the menu.

Apparently, "Additional Categories" also automatically inherits from
their "Main Category", so I had to remove a bunch.

[1]: https://specifications.freedesktop.org/menu-spec/menu-spec-1.0.html#category-registry
@minijackson minijackson requested a review from stephane-cea July 25, 2024 13:53
@minijackson minijackson self-assigned this Jul 25, 2024
Copy link
Collaborator

@stephane-cea stephane-cea left a comment

Choose a reason for hiding this comment

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

Looks good to me!

@stephane-cea stephane-cea merged commit e98e81c into epics-extensions:master Jul 26, 2024
2 checks passed
@minijackson minijackson deleted the phoebus-fix-hardcoded-python branch July 26, 2024 08:23
@minijackson minijackson added backport nixos-23.11 Backport pull request to the nixos-23.11 branch backport nixos-23.05 Backport pull request to the nixos-23.05 branch labels Jul 26, 2024
Copy link
Contributor

Git push to origin failed for nixos-23.11 with exitcode 1

Copy link
Contributor

Successfully created backport PR for nixos-23.11:

Copy link
Contributor

Backport failed for nixos-23.05, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin nixos-23.05
git worktree add -d .worktree/backport/120-to-nixos-23.05 origin/nixos-23.05
cd .worktree/backport/120-to-nixos-23.05
git switch --create backport/120-to-nixos-23.05
git cherry-pick -x b333f3a0153e12908c61155022f15e3658f36568 d90443fecce486ab4e773d336e6e55069d744ef4 8562a1402d38825ddf3eb214abc9270ce922862e

Copy link
Contributor

Backport failed for nixos-23.05, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin nixos-23.05
git worktree add -d .worktree/backport/120-to-nixos-23.05 origin/nixos-23.05
cd .worktree/backport/120-to-nixos-23.05
git switch --create backport/120-to-nixos-23.05
git cherry-pick -x b333f3a0153e12908c61155022f15e3658f36568 d90443fecce486ab4e773d336e6e55069d744ef4 8562a1402d38825ddf3eb214abc9270ce922862e

@minijackson minijackson removed the backport nixos-23.05 Backport pull request to the nixos-23.05 branch label Jul 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport nixos-23.11 Backport pull request to the nixos-23.11 branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Phoebus client references /usr/bin
2 participants