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.

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

linux-steam-integration: Append "Settings" to launcher menu item #34020

Merged
merged 1 commit into from Jan 24, 2018
Merged

linux-steam-integration: Append "Settings" to launcher menu item #34020

merged 1 commit into from Jan 24, 2018

Conversation

benley
Copy link
Member

@benley benley commented Jan 18, 2018

Motivation for this change

It just shows up as "Linux Steam Integration" otherwise, which is confusing. The actual LSI launcher's name in the menu is "LSI Steam", right next to this one.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

dtzWill
dtzWill requested changes Jan 18, 2018
View reviewed changes
Copy link
Member

@dtzWill dtzWill left a comment

Choose a reason for hiding this comment

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

postInstall doesn't run since this defines a custom installPhase (and as a result, this change does nothing).

Probably simplest to just append this to the existing installPhase. Alternatively there's some magic hook invocation that "should" be executed at the beginning of custom installPhase definitions to run these things.

@adisbladis
Copy link
Member

cc @etu

@etu
Copy link
Contributor

etu commented Jan 19, 2018 •
edited

@benley As @dtzWill said, the postInstall isn't executed. So this patch doesn't actually do anything.

But you can put your sed line in the postPatch and change the filename from $out/share/applications/lsi-settings.desktop to data/lsi-settings.desktop.in.

@benley
Copy link
Member Author

benley commented Jan 19, 2018

Oh, good point. I'm putting it in the postPatch phase, that sounds right.

@benley benley merged commit 2d57426 into NixOS:master Jan 24, 2018
@benley benley deleted the benley/lsi-settings branch January 24, 2018 18:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dtzWill dtzWill dtzWill requested changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@benley @adisbladis @etu @dtzWill @GrahamcOfBorg