diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2011-09-07 22:53:31 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2011-09-07 22:53:31 +0000 |
| commit | cded4473e7ab52afcd5da1622546b9fcf60d8e10 (patch) | |
| tree | fc3aadea6855ffafda70021a7bcaa80a09b625a0 /pkgs/development/libraries/ntrack | |
| parent | 5fb9815469660628bd843cd7b13fbd062930b73e (diff) | |
| download | nixpkgs-cded4473e7ab52afcd5da1622546b9fcf60d8e10.tar nixpkgs-cded4473e7ab52afcd5da1622546b9fcf60d8e10.tar.gz nixpkgs-cded4473e7ab52afcd5da1622546b9fcf60d8e10.tar.bz2 nixpkgs-cded4473e7ab52afcd5da1622546b9fcf60d8e10.tar.lz nixpkgs-cded4473e7ab52afcd5da1622546b9fcf60d8e10.tar.xz nixpkgs-cded4473e7ab52afcd5da1622546b9fcf60d8e10.tar.zst nixpkgs-cded4473e7ab52afcd5da1622546b9fcf60d8e10.zip | |
Apply upstream patches to ntrack\n\nProbably fixes 100% CPU problem in kded module
svn path=/nixpkgs/trunk/; revision=29105
Diffstat (limited to 'pkgs/development/libraries/ntrack')
| -rw-r--r-- | pkgs/development/libraries/ntrack/default.nix | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/pkgs/development/libraries/ntrack/default.nix b/pkgs/development/libraries/ntrack/default.nix index e2d811ab339..bd1c97c3043 100644 --- a/pkgs/development/libraries/ntrack/default.nix +++ b/pkgs/development/libraries/ntrack/default.nix @@ -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 @@ stdenv.mkDerivation rec { 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 } |