BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

network-manager/l2tp: 0.9.8.7 -> 1.2.2

Browse source
This commit is contained in:
obadz 2016-06-22 01:53:23 +01:00
parent c434fd0659
commit a8074165ef
1 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pkgs/tools/networking/network-manager/l2tp.nix
View file

@ -1,20 +1,20 @@
{ stdenv, fetchFromGitHub, automake, autoconf, libtool, intltool, pkgconfig { stdenv, fetchFromGitHub, automake, autoconf, libtool, intltool, pkgconfig
, networkmanager, ppp, xl2tpd, strongswan , networkmanager, networkmanagerapplet, ppp, xl2tpd, strongswan, libsecret
, withGnome ? true, gnome3 }: , withGnome ? true, gnome3 }:
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 = "0.9.8.7"; version = networkmanager.version;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "seriyps"; owner = "nm-l2tp";
repo = "NetworkManager-l2tp"; repo = "network-manager-l2tp";
rev = version; rev = version;
sha256 = "07gl562p3f6l2wn64f3vvz1ygp3hsfhiwh4sn04c3fahfdys69zx"; sha256 = "1zqdhm7pzhaq6q8pddj9ki25qs9m6qwqgzc5x07a0qffla2rq5j1";
}; };
buildInputs = [ networkmanager ppp ] buildInputs = [ networkmanager ppp networkmanagerapplet libsecret ]
++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring ]; ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring ];
nativeBuildInputs = [ automake autoconf libtool intltool pkgconfig ]; nativeBuildInputs = [ automake autoconf libtool intltool pkgconfig ];
@ -25,9 +25,6 @@ stdenv.mkDerivation rec {
substituteInPlace ./src/nm-l2tp-service.c \ substituteInPlace ./src/nm-l2tp-service.c \
--replace /sbin/ipsec ${strongswan}/bin/ipsec \ --replace /sbin/ipsec ${strongswan}/bin/ipsec \
--replace /sbin/xl2tpd ${xl2tpd}/bin/xl2tpd --replace /sbin/xl2tpd ${xl2tpd}/bin/xl2tpd
# Workaround https://github.com/xelerance/xl2tpd/issues/108
substituteInPlace ./src/nm-l2tp-service.c --replace 'write_config_option (pppopt_fd, "lock\n");' ""
''; '';
preConfigure = "./autogen.sh"; preConfigure = "./autogen.sh";