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

brave: fix path to brave in *.desktop file #66721

Merged
merged 1 commit into from Aug 18, 2019

Conversation

emmanuelrosa
Copy link
Contributor

Motivation for this change

At some point the path to the Brave executable changed in the upstream *.desktop file from /usr/bin/brave-browser to /usr/bin/brave-browser-stable This prevents the search-and-replace used by the Brave Nix package from fixing the path to the Brave wrapper script. Thus, attempting to launch Brave via the *.desktop file, such as by using rofi, fails.

This change updates the search-and-replace code in the Nix package so that it's able to fix the path, as it was doing before.

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 @

@mmahut
Copy link
Member

mmahut commented Aug 16, 2019

@GrahamcOfBorg build brave

@worldofpeace
Copy link
Contributor

Do the icons show up for you @emmanuelrosa?

I tested with nix-env and didn't see any icons.

Copy link
Contributor

@worldofpeace worldofpeace left a comment

Choose a reason for hiding this comment

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

Successfully launched with desktop file.

@emmanuelrosa
Copy link
Contributor Author

Yes, @emmanuelrosa. The icons show up for me when using nix-env -i on NixOS. The icons didn't show up on a non-NixOS system (Pop! OS).

@worldofpeace
Copy link
Contributor

The icons didn't show up on a non-NixOS system (Pop! OS).

Hmm, we should probably fix that. But out of scope of this PR. Thanks for the fix ✨

@worldofpeace worldofpeace merged commit 3a26957 into NixOS:master Aug 18, 2019
@emmanuelrosa emmanuelrosa deleted the brave-desktop-file-fix branch August 19, 2019 12:39
@emmanuelrosa
Copy link
Contributor Author

I mis-spoke. The .desktop file was not detected on Pop! OS, so it wasn't that the icon didn't show up.

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.

None yet

3 participants