diff options
| author | obadz <obadz-git@obadz.com> | 2016-06-23 23:35:19 +0100 |
|---|---|---|
| committer | obadz <obadz-git@obadz.com> | 2016-06-23 23:35:43 +0100 |
| commit | 24520af0faf831f977c2f38d41c757c6b24a6072 (patch) | |
| tree | 939cb80fea99dee7ed6d446aa0a17f25730a4574 /pkgs/tools | |
| parent | 8399068b80de149b0e20c0eed489869bcbf2a341 (diff) | |
| download | nixlib-24520af0faf831f977c2f38d41c757c6b24a6072.tar nixlib-24520af0faf831f977c2f38d41c757c6b24a6072.tar.gz nixlib-24520af0faf831f977c2f38d41c757c6b24a6072.tar.bz2 nixlib-24520af0faf831f977c2f38d41c757c6b24a6072.tar.lz nixlib-24520af0faf831f977c2f38d41c757c6b24a6072.tar.xz nixlib-24520af0faf831f977c2f38d41c757c6b24a6072.tar.zst nixlib-24520af0faf831f977c2f38d41c757c6b24a6072.zip | |
network-manager/l2tp: remove workaround that's now in main repo
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/networking/network-manager/l2tp.nix | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/pkgs/tools/networking/network-manager/l2tp.nix b/pkgs/tools/networking/network-manager/l2tp.nix index cd08b92d3c19..af3b193798f6 100644 --- a/pkgs/tools/networking/network-manager/l2tp.nix +++ b/pkgs/tools/networking/network-manager/l2tp.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "nm-l2tp"; repo = "network-manager-l2tp"; - rev = version; - sha256 = "1zqdhm7pzhaq6q8pddj9ki25qs9m6qwqgzc5x07a0qffla2rq5j1"; + rev = "c0cedda5e2a0ded695b497c361eaf577068520cb"; + sha256 = "01f39ghc37vw4n4i7whyikgqz8vzxf41q9fsv2gfw1g501cny1j2"; }; buildInputs = [ networkmanager ppp networkmanagerapplet libsecret ] @@ -25,12 +25,6 @@ stdenv.mkDerivation rec { substituteInPlace ./src/nm-l2tp-service.c \ --replace /sbin/ipsec ${strongswan}/bin/ipsec \ --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"; |