Fix syncthing-gtk hard coded paths #22012
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@thanegill, thanks for your PR! By analyzing the history of the files in this pull request, we identified @FRidh to be a potential reviewer. |
7c6f434c
reviewed
Jan 21, 2017
| @@ -25250,6 +25250,7 @@ in { | |||
| substituteInPlace "scripts/syncthing-gtk" \ | |||
| --replace "/usr/share" "$out/share" | |||
| substituteInPlace setup.py --replace "version = get_version()" "version = '${version}'" | |||
| substituteInPlace syncthing-gtk.desktop --replace "/usr/bin/syncthing-gtk" "$out/usr/bin/syncthing-gtk" | |||
There was a problem hiding this comment.
I think /usr part should have been removed.
thanegill
changed the title
|
Updated with suggested changes, tested, and fixed other hard-coded paths. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
syncthing-gtk.desktop link is broken.
Things done
(nix.useSandbox on NixOS,
or option
build-use-sandboxinnix.confon non-NixOS)
nix-shell -p nox --run "nox-review wip"./result/bin/)