about summary refs log tree commit diff
diff options
context:
space:
mode:
authorYury G. Kudryashov <urkud.urkud@gmail.com>2011-09-19 05:16:11 +0000
committerYury G. Kudryashov <urkud.urkud@gmail.com>2011-09-19 05:16:11 +0000
commitef664e90a081d0ac66fe0f43007de53a60e3f812 (patch)
tree22a6ef797301b1377c37e0ffa4a905b2220dd30a
parent5565ec4eeca39a06c7b12212980838ad1ff37451 (diff)
downloadnixlib-ef664e90a081d0ac66fe0f43007de53a60e3f812.tar
nixlib-ef664e90a081d0ac66fe0f43007de53a60e3f812.tar.gz
nixlib-ef664e90a081d0ac66fe0f43007de53a60e3f812.tar.bz2
nixlib-ef664e90a081d0ac66fe0f43007de53a60e3f812.tar.lz
nixlib-ef664e90a081d0ac66fe0f43007de53a60e3f812.tar.xz
nixlib-ef664e90a081d0ac66fe0f43007de53a60e3f812.tar.zst
nixlib-ef664e90a081d0ac66fe0f43007de53a60e3f812.zip
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
-rw-r--r--pkgs/desktops/kde-4.7/kde-runtime.nix6
1 files 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 dd2ddab6c617..96b6c3a1c784 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 ];