public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

networkmanager-l2tp: 1.2.10 -> 1.2.12

Browse Source 
Same patchups but moved to new file.
This commit is contained in:
Will Dietz 2019-04-01 14:38:04 -05:00 committed by obadz
parent 69555825f8
commit cdf96e8a08
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/tools/networking/network-manager/l2tp/default.nix
View File

@ -1,17 +1,18 @@
{ stdenv, substituteAll, fetchFromGitHub, autoreconfHook, libtool, intltool, pkgconfig { stdenv, substituteAll, fetchFromGitHub, autoreconfHook, libtool, intltool, pkgconfig
, file, findutils
, gtk3, networkmanager, ppp, xl2tpd, strongswan, libsecret , gtk3, networkmanager, ppp, xl2tpd, strongswan, libsecret
, withGnome ? true, gnome3, networkmanagerapplet }: , withGnome ? true, gnome3, networkmanagerapplet }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
pname = "NetworkManager-l2tp"; pname = "NetworkManager-l2tp";
version = "1.2.10"; version = "1.2.12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nm-l2tp"; owner = "nm-l2tp";
repo = "network-manager-l2tp"; repo = "network-manager-l2tp";
rev = "${version}"; rev = "${version}";
sha256 = "1vm004nj2n5abpywr7ji6r28scf7xs45zw4rqrm8jn7mysf96h0x"; sha256 = "0cq07kvlm98s8a7l4a3zmqnif8x3307kv7n645zx3f1r7x72b8m4";
}; };
patches = [ patches = [
@ -24,7 +25,7 @@ stdenv.mkDerivation rec {
buildInputs = [ networkmanager ppp ] buildInputs = [ networkmanager ppp ]
++ stdenv.lib.optionals withGnome [ gtk3 libsecret networkmanagerapplet ]; ++ stdenv.lib.optionals withGnome [ gtk3 libsecret networkmanagerapplet ];
nativeBuildInputs = [ autoreconfHook libtool intltool pkgconfig ]; nativeBuildInputs = [ autoreconfHook libtool intltool pkgconfig file findutils ];
preConfigure = '' preConfigure = ''
intltoolize -f intltoolize -f

10
pkgs/tools/networking/network-manager/l2tp/fix-paths.patch
View File

@ -1,6 +1,8 @@
--- a/src/nm-l2tp-service.c diff --git a/shared/utils.c b/shared/utils.c
+++ b/src/nm-l2tp-service.c index c978a1f..d2c36cd 100644
@@ -480,7 +480,7 @@ --- a/shared/utils.c
+++ b/shared/utils.c
@@ -52,7 +52,7 @@ nm_find_ipsec (void)
{ {
static const char *ipsec_binary_paths[] = static const char *ipsec_binary_paths[] =
{ {
@ -9,7 +11,7 @@
"/usr/sbin/ipsec", "/usr/sbin/ipsec",
"/usr/local/sbin/ipsec", "/usr/local/sbin/ipsec",
"/sbin/strongswan", "/sbin/strongswan",
@@ -505,7 +505,7 @@ @@ -77,7 +77,7 @@ nm_find_l2tpd (void)
{ {
static const char *l2tp_binary_paths[] = static const char *l2tp_binary_paths[] =
{ {