diff options
| author | William A. Kennington III <william@wkennington.com> | 2013-12-02 10:40:22 -0600 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2013-12-07 01:38:02 -0600 |
| commit | 2079bfdc58c50acccb02c0a491a31a452cd2e24d (patch) | |
| tree | 8091ac19b111949787b0bece3261138c3a64875f /pkgs/development/libraries/ntrack | |
| parent | 47cb33819d13faedf6f6090ad5b08103597242c8 (diff) | |
| download | nixpkgs-2079bfdc58c50acccb02c0a491a31a452cd2e24d.tar nixpkgs-2079bfdc58c50acccb02c0a491a31a452cd2e24d.tar.gz nixpkgs-2079bfdc58c50acccb02c0a491a31a452cd2e24d.tar.bz2 nixpkgs-2079bfdc58c50acccb02c0a491a31a452cd2e24d.tar.lz nixpkgs-2079bfdc58c50acccb02c0a491a31a452cd2e24d.tar.xz nixpkgs-2079bfdc58c50acccb02c0a491a31a452cd2e24d.tar.zst nixpkgs-2079bfdc58c50acccb02c0a491a31a452cd2e24d.zip | |
Fix ntrack for latest libnl release
Diffstat (limited to 'pkgs/development/libraries/ntrack')
| -rw-r--r-- | pkgs/development/libraries/ntrack/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/libraries/ntrack/libnl-fix.patch | 11 |
2 files changed, 17 insertions, 1 deletions
diff --git a/pkgs/development/libraries/ntrack/default.nix b/pkgs/development/libraries/ntrack/default.nix index 13ab00e41be..b7460778474 100644 --- a/pkgs/development/libraries/ntrack/default.nix +++ b/pkgs/development/libraries/ntrack/default.nix @@ -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"; diff --git a/pkgs/development/libraries/ntrack/libnl-fix.patch b/pkgs/development/libraries/ntrack/libnl-fix.patch new file mode 100644 index 00000000000..806a0178ec8 --- /dev/null +++ b/pkgs/development/libraries/ntrack/libnl-fix.patch @@ -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)))) { |