netsniff-ng 0.5.9-70-g123b444 -> 0.5.9-71-g77445f8

Remove patch to curvetun build (now upstream).
This commit is contained in:
Tobias Geerinckx-Rice 2015-08-05 21:25:07 +02:00
parent dc4d5aa29a
commit 4f9249caaf

View File

@ -2,7 +2,7 @@
, libnetfilter_conntrack, libnl, libpcap, libsodium, liburcu, ncurses, perl , libnetfilter_conntrack, libnl, libpcap, libsodium, liburcu, ncurses, perl
, pkgconfig, zlib }: , pkgconfig, zlib }:
let version = "0.5.9-70-g123b444"; in let version = "0.5.9-71-g77445f8"; in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "netsniff-ng-${version}"; name = "netsniff-ng-${version}";
@ -10,18 +10,14 @@ stdenv.mkDerivation {
src = fetchFromGitHub rec { src = fetchFromGitHub rec {
repo = "netsniff-ng"; repo = "netsniff-ng";
owner = repo; owner = repo;
rev = "123b444d78337a8f00d3ba83de3af3cdc6891de8"; rev = "77445f81d451eef6b78b79a2bcc24d21d4be4178";
sha256 = "0yqh83g0ja4ggdiylp63h57pxx39fn6axzfvs2w0lp27gbl4yc0i"; sha256 = "0ny9bph070mny6i9r0i3wsx2bsl53135n439ab6r9qk710xjz91j";
}; };
buildInputs = [ bison flex geoip geolite-legacy libcli libnet libnl buildInputs = [ bison flex geoip geolite-legacy libcli libnet libnl
libnetfilter_conntrack libpcap libsodium liburcu ncurses perl libnetfilter_conntrack libpcap libsodium liburcu ncurses perl
pkgconfig zlib ]; pkgconfig zlib ];
postPatch = ''
substituteInPlace curvetun/Makefile --replace "curvetun.o" "curvetun.o sysctl.o"
'';
# ./configure is not autoGNU but some home-brewn magic # ./configure is not autoGNU but some home-brewn magic
configurePhase = '' configurePhase = ''
patchShebangs configure patchShebangs configure