diff options
| author | Peter Simons <simons@cryp.to> | 2013-12-10 00:25:54 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2013-12-10 00:25:54 +0100 |
| commit | 486e7736dfe0ca3b99a98b21bec8090d3e2df5d8 (patch) | |
| tree | 3364a88923232441475d51052a77ff36e51e09c6 /pkgs/development/libraries/ntrack/libnl-fix.patch | |
| parent | 4e385fcda73dd437152d42aefdde4bcb79d23c78 (diff) | |
| parent | 328d59eab6c2cdd94cb358d635fd6b4b64982e73 (diff) | |
| download | nixpkgs-486e7736dfe0ca3b99a98b21bec8090d3e2df5d8.tar nixpkgs-486e7736dfe0ca3b99a98b21bec8090d3e2df5d8.tar.gz nixpkgs-486e7736dfe0ca3b99a98b21bec8090d3e2df5d8.tar.bz2 nixpkgs-486e7736dfe0ca3b99a98b21bec8090d3e2df5d8.tar.lz nixpkgs-486e7736dfe0ca3b99a98b21bec8090d3e2df5d8.tar.xz nixpkgs-486e7736dfe0ca3b99a98b21bec8090d3e2df5d8.tar.zst nixpkgs-486e7736dfe0ca3b99a98b21bec8090d3e2df5d8.zip | |
Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts: pkgs/tools/networking/p2p/amule/default.nix
Diffstat (limited to 'pkgs/development/libraries/ntrack/libnl-fix.patch')
| -rw-r--r-- | pkgs/development/libraries/ntrack/libnl-fix.patch | 11 |
1 files changed, 11 insertions, 0 deletions
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)))) { |