diff options
| author | Will Dietz <w@wdtz.org> | 2019-04-01 14:38:04 -0500 |
|---|---|---|
| committer | obadz <3359345+obadz@users.noreply.github.com> | 2019-04-02 17:57:00 +0100 |
| commit | cdf96e8a084a3efb60a93ab613183704a32f42ed (patch) | |
| tree | f19dcf8b13ad3824d654b945734e1060afbe4b34 | |
| parent | 69555825f84a0f81c32097913088ab586e12b982 (diff) | |
| download | nixpkgs-cdf96e8a084a3efb60a93ab613183704a32f42ed.tar nixpkgs-cdf96e8a084a3efb60a93ab613183704a32f42ed.tar.gz nixpkgs-cdf96e8a084a3efb60a93ab613183704a32f42ed.tar.bz2 nixpkgs-cdf96e8a084a3efb60a93ab613183704a32f42ed.tar.lz nixpkgs-cdf96e8a084a3efb60a93ab613183704a32f42ed.tar.xz nixpkgs-cdf96e8a084a3efb60a93ab613183704a32f42ed.tar.zst nixpkgs-cdf96e8a084a3efb60a93ab613183704a32f42ed.zip | |
networkmanager-l2tp: 1.2.10 -> 1.2.12
Same patchups but moved to new file.
| -rw-r--r-- | pkgs/tools/networking/network-manager/l2tp/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/tools/networking/network-manager/l2tp/fix-paths.patch | 10 |
2 files changed, 10 insertions, 7 deletions
diff --git a/pkgs/tools/networking/network-manager/l2tp/default.nix b/pkgs/tools/networking/network-manager/l2tp/default.nix index 5fc591f0a43..352b88f3935 100644 --- a/pkgs/tools/networking/network-manager/l2tp/default.nix +++ b/pkgs/tools/networking/network-manager/l2tp/default.nix @@ -1,17 +1,18 @@ { stdenv, substituteAll, fetchFromGitHub, autoreconfHook, libtool, intltool, pkgconfig +, file, findutils , gtk3, networkmanager, ppp, xl2tpd, strongswan, libsecret , withGnome ? true, gnome3, networkmanagerapplet }: stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; pname = "NetworkManager-l2tp"; - version = "1.2.10"; + version = "1.2.12"; src = fetchFromGitHub { owner = "nm-l2tp"; repo = "network-manager-l2tp"; rev = "${version}"; - sha256 = "1vm004nj2n5abpywr7ji6r28scf7xs45zw4rqrm8jn7mysf96h0x"; + sha256 = "0cq07kvlm98s8a7l4a3zmqnif8x3307kv7n645zx3f1r7x72b8m4"; }; patches = [ @@ -24,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ networkmanager ppp ] ++ stdenv.lib.optionals withGnome [ gtk3 libsecret networkmanagerapplet ]; - nativeBuildInputs = [ autoreconfHook libtool intltool pkgconfig ]; + nativeBuildInputs = [ autoreconfHook libtool intltool pkgconfig file findutils ]; preConfigure = '' intltoolize -f diff --git a/pkgs/tools/networking/network-manager/l2tp/fix-paths.patch b/pkgs/tools/networking/network-manager/l2tp/fix-paths.patch index 0a068ee800c..531672c3936 100644 --- a/pkgs/tools/networking/network-manager/l2tp/fix-paths.patch +++ b/pkgs/tools/networking/network-manager/l2tp/fix-paths.patch @@ -1,6 +1,8 @@ ---- a/src/nm-l2tp-service.c -+++ b/src/nm-l2tp-service.c -@@ -480,7 +480,7 @@ +diff --git a/shared/utils.c b/shared/utils.c +index c978a1f..d2c36cd 100644 +--- a/shared/utils.c ++++ b/shared/utils.c +@@ -52,7 +52,7 @@ nm_find_ipsec (void) { static const char *ipsec_binary_paths[] = { @@ -9,7 +11,7 @@ "/usr/sbin/ipsec", "/usr/local/sbin/ipsec", "/sbin/strongswan", -@@ -505,7 +505,7 @@ +@@ -77,7 +77,7 @@ nm_find_l2tpd (void) { static const char *l2tp_binary_paths[] = { |