diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2011-08-10 20:19:49 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2011-08-10 20:19:49 +0000 |
| commit | 799d82249bf9a5f1c1b1980bf0da47b9bd2485ee (patch) | |
| tree | fd186a90037f6e82527ac6505f7364fa5b298b0a /pkgs/development/libraries/ntrack | |
| parent | 3e83b44fa9d8fc0800715647a0827e8d5f888f6f (diff) | |
| download | nixpkgs-799d82249bf9a5f1c1b1980bf0da47b9bd2485ee.tar nixpkgs-799d82249bf9a5f1c1b1980bf0da47b9bd2485ee.tar.gz nixpkgs-799d82249bf9a5f1c1b1980bf0da47b9bd2485ee.tar.bz2 nixpkgs-799d82249bf9a5f1c1b1980bf0da47b9bd2485ee.tar.lz nixpkgs-799d82249bf9a5f1c1b1980bf0da47b9bd2485ee.tar.xz nixpkgs-799d82249bf9a5f1c1b1980bf0da47b9bd2485ee.tar.zst nixpkgs-799d82249bf9a5f1c1b1980bf0da47b9bd2485ee.zip | |
ntrack-014, use libnl-3.x
svn path=/nixpkgs/trunk/; revision=28469
Diffstat (limited to 'pkgs/development/libraries/ntrack')
| -rw-r--r-- | pkgs/development/libraries/ntrack/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/development/libraries/ntrack/libnl2.patch | 14 |
2 files changed, 4 insertions, 19 deletions
diff --git a/pkgs/development/libraries/ntrack/default.nix b/pkgs/development/libraries/ntrack/default.nix index 53912016662..e2d811ab339 100644 --- a/pkgs/development/libraries/ntrack/default.nix +++ b/pkgs/development/libraries/ntrack/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, glib, qt4, pkgconfig, libnl2, pygobject, python }: +{ stdenv, fetchurl, glib, qt4, pkgconfig, libnl, pygobject, python }: let - version = "011"; + version = "014"; in stdenv.mkDerivation rec { @@ -9,16 +9,15 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://launchpad.net/ntrack/main/${version}/+download/${name}.tar.gz"; - sha256 = "0qi6nhymsv7w6hfxnz9jbxk311wb6x9jci7a3gcr4cc5nwkl7sxy"; + sha256 = "1aqn3q0dj2kk0j9rf02qgbfghlykaas7q0g8wxyz7nd6zg4qhyj2"; }; - buildInputs = [ libnl2 qt4 ]; + buildInputs = [ libnl qt4 ]; buildNativeInputs = [ pkgconfig python ]; configureFlags = "--without-gobject CFLAGS=--std=gnu99"; - patches = [ ./libnl2.patch ]; postPatch = '' sed -e "s@/usr\(/lib/ntrack/modules/\)@$out&@" -i common/ntrack.c ''; diff --git a/pkgs/development/libraries/ntrack/libnl2.patch b/pkgs/development/libraries/ntrack/libnl2.patch deleted file mode 100644 index 6e76c749b15..00000000000 --- a/pkgs/development/libraries/ntrack/libnl2.patch +++ /dev/null @@ -1,14 +0,0 @@ -Source: upstream rev. 269 - -=== modified file 'modules/ntrack-libnl.c' ---- old/modules/ntrack-libnl.c 2010-12-26 13:22:32 +0000 -+++ new/modules/ntrack-libnl.c 2011-03-26 23:21:49 +0000 -@@ -74,6 +74,7 @@ - nl_cache_mngr_add (mngr, \ - name, \ - 0, \ -+ 0, \ - &cache_o) - #define NL_PRINT_ERROR(text,err) \ - printf ("%s/%s\n", text, nl_geterror(err)) - |