pybitmessage: 0.4.4 -> 0.6.2 #26616
pybitmessage: 0.4.4 -> 0.6.2 #26616
Conversation
|
Oh, forgot to mention: I only built this on 451478c and 32bit, since I don't have a 64bit machine at hand and it wants to recompile systemd etc. on master. |
| @@ -30,7 +30,7 @@ patchPythonScript() { | |||
|
|
|||
| # The magicalSedExpression will invoke a "$(basename "$f")", so | |||
| # if you change $f to something else, be sure to also change it | |||
| # in pkgs/top-level/python-packages.nix! | |||
| # in wrap-python.nix! | |||
| # It also uses $program_PYTHONPATH. | |||
| sed -i "$f" -re '@magicalSedExpression@' | |||
| } | |||
There was a problem hiding this comment.
Please fix the broken quoting in wrap.sh in various places.
There was a problem hiding this comment.
Could you elaborate some more? My intention was only to fix the broken reference to wrap-python.nix, nothing else. If there's more to be done in wrap.sh, it should probably not be in this PR, since fixing that reference is already extraneous to this PR, which is about bitmessage.
| --replace "PREFIX?=/usr/local" "" \ | ||
| --replace "/usr" "" | ||
| ''; | ||
| substituteInPlace setup.py \ |
There was a problem hiding this comment.
Why are you making these replacements? Add a comment explaining what its for.
| --replace "/opt/openssl-compat-bitcoin/lib/" "${openssl.out}/lib/" | ||
| wrapProgram $out/bin/pybitmessage \ | ||
| --prefix PYTHONPATH : "$(toPythonPath $out):$PYTHONPATH" | ||
| makeWrapperArgs = '' |
There was a problem hiding this comment.
Patching the source to hardcode paths to libraries has preference over setting LD_LIBRARY_PATH.
| @@ -30,7 +30,7 @@ patchPythonScript() { | |||
|
|
|||
| # The magicalSedExpression will invoke a "$(basename "$f")", so | |||
| # if you change $f to something else, be sure to also change it | |||
| # in pkgs/top-level/python-packages.nix! | |||
| # in wrap-python.nix! | |||
|
ping me when its done and I'll merge |
Actually, the 'print…' substitutions wouldn't be necessary, but since the output confused me while packaging, I thought I'd protect others from wasting their precious time on the same matter.
|
Patching the source to hardcode paths to libraries has preference over
setting `LD_LIBRARY_PATH`.
I did actually try that first, but gave up after some frustration because
I didn't manage to get it working. If you think it is important enough
for you (or anyone else who wants to spend their time doing that) to
try it yourself, look at `src/depends.py` (function `check_openssl`)
and `src/pyelliptic/openssl.py`.
@FRidh I think it's done :)
|
|
It would help if you show what you tried. |
|
It would help if you show what you tried.
Won't waste any more time on this, sry. I tried fiddling with the files
I listed above, but I didn't get to any satisfactory (intermediate)
results, so there's nothing to show. (I don't even remember what I did,
just that I was frustrated enough to search for alternatives.) If you
think this is important enough, try it yourself.
|
squashed hashes: 3ee20b2 b9a3a3b (details -> NixOS#26616)
fixes requested changes in NixOS#26616
|
@FRidh Sorry for the rough tone I used in my replies. I got fairly emotional (but I'm not sure how much my replies are showing that) given I didn't agree that the changes you requested would be useful. Now that I know (e920377) how easy it would've been (which I kinda assumed), I think your "nitpicking" wasn't that bad. Thanks for your work as a maintainer! |
Motivation for this change
Things done
(nix.useSandbox on NixOS,
or option
build-use-sandboxinnix.confon non-NixOS)
nix-shell -p nox --run "nox-review wip"./result/bin/)It seems kinda strange to me to have pybitmessage in
instant-messengers(since it is not meant to be used that way, but rather asynchronously), I think it would fit better inp2p. Should I change that too?