-
-
Notifications
You must be signed in to change notification settings - Fork 14.1k
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
WIP: Add NetworkManager-sstp #28616
WIP: Add NetworkManager-sstp #28616
Conversation
@ilpianista, thanks for your PR! By analyzing the history of the files in this pull request, we identified @lethalman, @rickynils and @domenkozar to be potential reviewers. |
}; | ||
|
||
buildInputs = [ networkmanager sstp-client ppp libsecret ] | ||
++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring |
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.
libgnome-keyring
was replaced by libsecret
.
sed -i -e 's%"\(/usr/sbin\|/usr/pkg/sbin\|/usr/local/sbin\)/[^"]*",%%g' ./src/nm-sstp-service.c | ||
|
||
substituteInPlace ./src/nm-sstp-service.c \ | ||
--replace /sbin/sstp-client ${sstp-client}/bin/sstp-client \ |
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.
The file contains /sbin/sstpc
instead of /sbin/sstp-client
.
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.
Also, using a patch with substituteAll
would be better, as it prevents trivial errors like this one.
''; | ||
|
||
configureFlags = | ||
if withGnome then "--with-gnome --with-gtkver=3" else "--without-gnome"; |
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.
configureFlags
are preferred to form a list instead of string of space-separated list. This will be more future-proof (#15799).
if withGnome then "--with-gnome --with-gtkver=3" else "--without-gnome"; | ||
|
||
meta = { | ||
description = "SSTP plugin for NetworkManager"; |
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.
Please add a license.
stdenv.mkDerivation rec { | ||
name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; | ||
pname = "NetworkManager-sstp"; | ||
major = "1.2"; |
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 are you splitting the version?
Is this still wanted? |
It's no more needed by me. |
Motivation for this change
Add support for SSTP VPNs.
Things done
(nix.useSandbox on NixOS,
or option
build-use-sandbox
innix.conf
on non-NixOS)
nix-shell -p nox --run "nox-review wip"
./result/bin/
)