Skip to content
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

Closed
wants to merge 1 commit into from
Closed

WIP: Add NetworkManager-sstp #28616

wants to merge 1 commit into from

Conversation

ilpianista
Copy link
Contributor

Motivation for this change

Add support for SSTP VPNs.

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@mention-bot
Copy link

@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
Copy link
Contributor

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 \
Copy link
Contributor

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.

Copy link
Contributor

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";
Copy link
Contributor

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";
Copy link
Contributor

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";
Copy link
Contributor

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?

@jtojnar
Copy link
Contributor

jtojnar commented Oct 20, 2018

Is this still wanted?

@ilpianista
Copy link
Contributor Author

Is this still wanted?

It's no more needed by me.

@ilpianista ilpianista closed this Oct 22, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants