Author: urkud
Date: Wed Sep 7 22:53:31 2011
New Revision: 29105
URL: https://svn.nixos.org/websvn/nix/?rev=29105&sc=1
Log:
Apply upstream patches to ntrack\n\nProbably fixes 100% CPU problem in kded
module
Modified:
nixpkgs/trunk/pkgs/development/libraries/ntrack/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/ntrack/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/ntrack/default.nix Wed Sep 7
22:53:20 2011 (r29104)
+++ nixpkgs/trunk/pkgs/development/libraries/ntrack/default.nix Wed Sep 7
22:53:31 2011 (r29105)
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, glib, qt4, pkgconfig, libnl, pygobject, python }:
+{ stdenv, fetchurl, glib, qt4, pkgconfig, libnl, pygobject, python, automake
+, autoconf }:
let
version = "014";
@@ -14,11 +15,27 @@
buildInputs = [ libnl qt4 ];
- buildNativeInputs = [ pkgconfig python ];
+ buildNativeInputs = [ pkgconfig python automake autoconf ];
configureFlags = "--without-gobject CFLAGS=--std=gnu99";
- postPatch = ''
- sed -e "s@/usr\(/lib/ntrack/modules/\)@$out&@" -i common/ntrack.c
+ patchP0 = fetchurl {
+ url = http://bazaar.launchpad.net/~asac/ntrack/main/diff/312/309;
+ name = "ntrack-bzr-309-to-312.patch";
+ sha256 = "1bpjpikln2i7nsmd2gl82g08yzaqac311sgsva7z7pqccxz0vsj5";
+ };
+
+ patchP1 = fetchurl {
+ url =
"https://bugs.launchpad.net/ntrack/+bug/750554/+attachment/2291609/+files/ntrack_libnl_link.diff";;
+ sha256 = "1al6wfjph7nmck1q2q2z98cnzcrwpln2wwh45xynsxr6wgczwck6";
+ };
+
+ patchPhase =
+ ''
+ patch -p0 < ${patchP0}
+ patch -p1 < ${patchP1}
+ sed -e "s@/usr\(/lib/ntrack/modules/\)@$out&@" -i common/ntrack.c
'';
+
+ preConfigure = "automake"; # The second patch changes Makefile.am files
}
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
