Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'gum/master'

Browse Source
This commit is contained in:
lassulus 2016-08-04 19:55:54 +02:00
commit 6696a9f098
2 changed files with 6 additions and 1608 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
makefu/5pkgs/farpd/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
libpcap libpcap
libdnet libdnet
pcre pcre
libevent libevent.out # requires .so and .h
readline readline
autoconf autoconf
libtool libtool
@ -27,7 +27,10 @@ stdenv.mkDerivation rec {
pythonPackages.sqlite3 pythonPackages.sqlite3
]; ];
patches = [ patches = [
./farpd_0.2-11.diff ( fetchurl {
url = https://launchpad.net/ubuntu/+archive/primary/+files/farpd_0.2-11.diff.gz;
sha256 = "2c246b37de8aab9c73f955fb77101adefd90637d03f582b9f8ffae2903af2f94";
})
]; ];
# removes user install script from Makefile before automake # removes user install script from Makefile before automake
#patches = [ ./autoconf.patch ]; #patches = [ ./autoconf.patch ];
@ -35,6 +38,7 @@ stdenv.mkDerivation rec {
autoreconf -fi autoreconf -fi
substituteInPlace configure \ substituteInPlace configure \
--replace "dumbnet" "dnet" \
--replace "libpcap.a" "libpcap.so" \ --replace "libpcap.a" "libpcap.so" \
--replace "libevent.a" "libevent.so" \ --replace "libevent.a" "libevent.so" \
--replace "net/bpf.h" "pcap/bpf.h" --replace "net/bpf.h" "pcap/bpf.h"

1606
makefu/5pkgs/farpd/farpd_0.2-11.diff
View File

File diff suppressed because it is too large Load Diff