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

network-manager/l2tp: remove workaround that's now in main repo

Browse Source
This commit is contained in:
obadz 2016-06-23 23:35:19 +01:00
parent 8399068b80
commit 24520af0fa
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nm-l2tp"; owner = "nm-l2tp";
repo = "network-manager-l2tp"; repo = "network-manager-l2tp";
rev = version; rev = "c0cedda5e2a0ded695b497c361eaf577068520cb";
sha256 = "1zqdhm7pzhaq6q8pddj9ki25qs9m6qwqgzc5x07a0qffla2rq5j1"; sha256 = "01f39ghc37vw4n4i7whyikgqz8vzxf41q9fsv2gfw1g501cny1j2";
}; };
buildInputs = [ networkmanager ppp networkmanagerapplet libsecret ] buildInputs = [ networkmanager ppp networkmanagerapplet libsecret ]
@ -25,12 +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
# Remove when https://github.com/nm-l2tp/network-manager-l2tp/issues/9 gets fixed
# per http://stackoverflow.com/questions/9225567/how-to-print-a-int64-t-type-in-c
sed -i -e 's,^\(#include <string.h>\)$,\1\n#include <inttypes.h>,' ./properties/import-export.c
substituteInPlace ./properties/import-export.c \
--replace '%ld' '%" PRId64 "'
''; '';
preConfigure = "./autogen.sh"; preConfigure = "./autogen.sh";