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

ntrack-014, use libnl-3.x

Browse Source 
svn path=/nixpkgs/trunk/; revision=28469
This commit is contained in:
Yury G. Kudryashov 2011-08-10 20:19:49 +00:00
parent 3e83b44fa9
commit 799d82249b
2 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
{ stdenv, fetchurl, glib, qt4, pkgconfig, libnl2, pygobject, python }: { stdenv, fetchurl, glib, qt4, pkgconfig, libnl, pygobject, python }:
let let
version = "011"; version = "014";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -9,16 +9,15 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "http://launchpad.net/ntrack/main/${version}/+download/${name}.tar.gz"; url = "http://launchpad.net/ntrack/main/${version}/+download/${name}.tar.gz";
sha256 = "0qi6nhymsv7w6hfxnz9jbxk311wb6x9jci7a3gcr4cc5nwkl7sxy"; sha256 = "1aqn3q0dj2kk0j9rf02qgbfghlykaas7q0g8wxyz7nd6zg4qhyj2";
}; };
buildInputs = [ libnl2 qt4 ]; buildInputs = [ libnl qt4 ];
buildNativeInputs = [ pkgconfig python ]; buildNativeInputs = [ pkgconfig python ];
configureFlags = "--without-gobject CFLAGS=--std=gnu99"; configureFlags = "--without-gobject CFLAGS=--std=gnu99";
patches = [ ./libnl2.patch ];
postPatch = '' postPatch = ''
sed -e "s@/usr\(/lib/ntrack/modules/\)@$out&@" -i common/ntrack.c sed -e "s@/usr\(/lib/ntrack/modules/\)@$out&@" -i common/ntrack.c
''; '';

14
pkgs/development/libraries/ntrack/libnl2.patch
View File

@ -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))