diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2022-05-04 16:10:47 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2022-05-06 10:52:44 +0200 |
commit | b380589e3efa5d3f80085c2da36560b45ff81f08 (patch) | |
tree | febbb4d4e07d7a75d49f2961811f39bc51264322 /pkgs | |
parent | ce919800560f981da3bf4b43cee3974bd96fbd50 (diff) |
networkmanager-sstp: unstable-2020-04-20 → 1.3.0
https://gitlab.gnome.org/GNOME/network-manager-sstp/-/compare/735d8ca078f933e085029f60a737e3cf1d8c29a8...release-1.3.0
- Maintained again, moved to GNOME servers
- GTK4 support
- clean up
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/tools/networking/networkmanager/sstp/default.nix | 52 |
1 files changed, 30 insertions, 22 deletions
diff --git a/pkgs/tools/networking/networkmanager/sstp/default.nix b/pkgs/tools/networking/networkmanager/sstp/default.nix index 8b75db6495f7..93fd87b005b5 100644 --- a/pkgs/tools/networking/networkmanager/sstp/default.nix +++ b/pkgs/tools/networking/networkmanager/sstp/default.nix @@ -1,51 +1,59 @@ -{ lib, stdenv -, autoreconfHook -, fetchFromGitHub -, fetchpatch +{ stdenv +, lib +, fetchurl , file , glib , gnome , gtk3 +, gtk4 , intltool , libnma +, libnma-gtk4 , libsecret , networkmanager , pkg-config , ppp , sstp -, substituteAll -, withGnome ? true }: +, withGnome ? true +}: -let +stdenv.mkDerivation rec { pname = "NetworkManager-sstp"; - version = "unstable-2020-04-20"; -in stdenv.mkDerivation { + version = "1.3.0"; name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; - src = fetchFromGitHub { - owner = "enaess"; - repo = "network-manager-sstp"; - rev = "735d8ca078f933e085029f60a737e3cf1d8c29a8"; - sha256 = "0aahfhy2ch951kzj6gnd8p8hv2s5yd5y10wrmj68djhnx2ml8cd3"; + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "+IJw3jvOYs/+NDS9HvCrSQ6wxh1x1yqwiFij7UZb+rU="; }; - buildInputs = [ sstp networkmanager glib ppp ] - ++ lib.optionals withGnome [ gtk3 libsecret libnma ]; + nativeBuildInputs = [ + file + intltool + pkg-config + ]; - nativeBuildInputs = [ file intltool autoreconfHook pkg-config ]; + buildInputs = [ + sstp + networkmanager + glib + ppp + ] ++ lib.optionals withGnome [ + gtk3 + gtk4 + libsecret + libnma + libnma-gtk4 + ]; postPatch = '' sed -i 's#/sbin/pppd#${ppp}/bin/pppd#' src/nm-sstp-service.c sed -i 's#/sbin/sstpc#${sstp}/bin/sstpc#' src/nm-sstp-service.c ''; - # glib-2.62 deprecations - NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; - - preConfigure = "intltoolize"; configureFlags = [ - "--without-libnm-glib" "--with-gnome=${if withGnome then "yes" else "no"}" + "--with-gtk4=${if withGnome then "yes" else "no"}" "--enable-absolute-paths" ]; |