From ef664e90a081d0ac66fe0f43007de53a60e3f812 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 19 Sep 2011 05:16:11 +0000
Subject: [PATCH] Re-enable ntrack support in KDE-4.7

It seems that the patches applied to ntrack in r29105 fixed the problem.

svn path=/nixpkgs/trunk/; revision=29338
---
 pkgs/desktops/kde-4.7/kde-runtime.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/kde-4.7/kde-runtime.nix b/pkgs/desktops/kde-4.7/kde-runtime.nix
index dd2ddab6c61..96b6c3a1c78 100644
--- a/pkgs/desktops/kde-4.7/kde-runtime.nix
+++ b/pkgs/desktops/kde-4.7/kde-runtime.nix
@@ -1,13 +1,11 @@
 { kde, kdelibs, shared_desktop_ontologies, bzip2, xz, libssh, exiv2, attica
-, libcanberra, virtuoso, samba
+, libcanberra, virtuoso, samba, ntrack
 }:
 
-# TODO: Re-enable ntrack once it is fixed upstream
-
 kde {
   buildInputs =
     [ kdelibs shared_desktop_ontologies bzip2 xz libssh exiv2 attica
-      samba (libcanberra.override { gtk = null; })
+      samba (libcanberra.override { gtk = null; }) ntrack
     ];
 
   passthru.propagatedUserEnvPackages = [ virtuoso ];