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
wireguard-tools: clean up, wrap w/ wireguard-go on Darwin #40907
wireguard-tools: clean up, wrap w/ wireguard-go on Darwin #40907
Conversation
''; | ||
|
||
meta = with stdenv.lib; { | ||
homepage = https://www.wireguard.com/; | ||
downloadPage = https://git.zx2c4.com/WireGuard/refs/; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why was this line removed from wireguard-tools.nix but kept in wireguard.nix?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Didn't mean to remove. You noticed faster than I could amend :-)
e324de6
to
e9e044a
Compare
"DESTDIR=$(out)" | ||
"PREFIX=/" | ||
"-C" "tools" | ||
"WITH_BASHCOMPLETION=yes" | ||
"WITH_SYSTEMDUNITS=yes" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why not keep the useSystemd mark in here? It's indeed really useless on macOS.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Smaller variability helps package maintenance. In this case, useSystemd
required conditional patch in postFixup
phase. Given that it's just a text file, it seems to be easier to copy and patch anyway than to decide based on platform.
Success on x86_64-linux (full log) Attempted: wireguard-tools Partial log (click to expand)
|
Success on aarch64-linux (full log) Attempted: wireguard-tools Partial log (click to expand)
|
Success on x86_64-darwin (full log) Attempted: wireguard-tools Partial log (click to expand)
|
@kirelagin @zx2c4
Cleans up derivation (consolidates some things), also note that systemd unit is now built unconditionally (it is just a text file anyway). On Darwin,
wg
andwg-quick
are wrapped together withwireguard-go
.