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

Merge pull request #1319 from wkennington/ntrack

Browse Source 
Fix ntrack for latest libnl release
This commit is contained in:
Michael Raskin 2013-12-07 00:12:46 -08:00
commit 14a0050829
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/ntrack/default.nix
View File

@ -18,7 +18,12 @@ stdenv.mkDerivation rec {
configureFlags = "--without-gobject CFLAGS=--std=gnu99";
patchPhase = ''sed -e "s@/usr\(/lib/ntrack/modules/\)@$out&@" -i common/ntrack.c'';
# Remove this patch after version 016
patches = [ ./libnl-fix.patch ];
postPatch = ''
sed -e "s@/usr\(/lib/ntrack/modules/\)@$out&@" -i common/ntrack.c
'';
meta = {
description = "Network Connectivity Tracking library for Desktop Applications";

11
pkgs/development/libraries/ntrack/libnl-fix.patch Normal file
View File

@ -0,0 +1,11 @@
--- ./modules/ntrack-libnl.c.orig 2013-12-02 11:31:54.749215448 -0600
+++ ./modules/ntrack-libnl.c 2013-12-02 11:34:46.597684553 -0600
@@ -530,7 +530,7 @@
op_default_route_disappeared ((struct _ntrack_monitor_arch*) self, nl_info);
} else if (nl_info->topmost_route && topmost_route) {
int diff_bits;
- if ((diff_bits = (route_obj_ops.oo_id_attrs | ROUTE_ATTR_OIF
+ if ((diff_bits = (nl_object_get_id_attrs(OBJ_CAST(topmost_route)) | ROUTE_ATTR_OIF
| ROUTE_ATTR_GATEWAY) &
nl_object_diff (OBJ_CAST (nl_info->topmost_route),
OBJ_CAST (topmost_route)))) {