onionshare: init at 2.2 #85765
Merged
onionshare: init at 2.2 #85765
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
cole-h
reviewed
Apr 22, 2020
cole-h
reviewed
Apr 22, 2020
Comment on lines
72
to
77
| patches = [ ./fix-paths.patch ]; | ||
|
|
||
| # replace @tor@, @obfs4@, @geoip@ w/ store paths. | ||
| inherit tor obfs4; | ||
| inherit (tor) geoip; | ||
| postPatch = "substituteAllInPlace onionshare/common.py"; |
There was a problem hiding this comment.
This should work as-is, but please test first... I've been known to make mistakes.
Suggested change
| patches = [ ./fix-paths.patch ]; | |
| # replace @tor@, @obfs4@, @geoip@ w/ store paths. | |
| inherit tor obfs4; | |
| inherit (tor) geoip; | |
| postPatch = "substituteAllInPlace onionshare/common.py"; | |
| patches = [ | |
| (substituteAll { | |
| src = ./fix-paths.patch; | |
| inherit tor obfs4; | |
| inherit (tor) geoip; | |
| }) | |
| ]; |
There was a problem hiding this comment.
That breaks my code: the patch references @out@.
There was a problem hiding this comment.
What is the goal of your requested change?
There was a problem hiding this comment.
The goal is to make it look less cluttered and follow the soft standard of what happens in most other packages.
To deal with @out@, the best way would be to keep postPatch, but change it to substituteInPlace onionshare/common.py --subst-var out.
bbjubjub2494
force-pushed
the
init_onionshare
branch
from
21f7deb
to
ffb41f8
Compare
|
It worked for me. |
|
Successfully shared a file. Didn't test GUI. Result of 2 packages built:- onionshare - onionshare-gui |
Br1ght0ne
approved these changes
Apr 23, 2020
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
Meet #83029
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)