From 94014f4adc1a7d5e5da5e7d75824781f2c8a0897 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 5 Sep 2011 17:55:53 +0000
Subject: [PATCH] * Get the Virtuoso backend in Soprano/Nepomuk to work. 
 Soprano tries   to find virtodbc_r.so in QT_PLUGIN_PATH (among other
 locations), so   make sure that Virtuoso can be found there.

svn path=/nixos/trunk/; revision=29033
---
 modules/programs/bash/bashrc.sh                | 2 +-
 modules/services/x11/desktop-managers/kde4.nix | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/programs/bash/bashrc.sh b/modules/programs/bash/bashrc.sh
index 940e3f7cd6b..8a6cc5bb21c 100644
--- a/modules/programs/bash/bashrc.sh
+++ b/modules/programs/bash/bashrc.sh
@@ -45,7 +45,7 @@ for i in $NIX_PROFILES; do # !!! reverse
     # KDE/Gnome stuff.
     export KDEDIRS=$i${KDEDIRS:+:}$KDEDIRS
     export STRIGI_PLUGIN_PATH=$i/lib/strigi/${STRIGI_PLUGIN_PATH:+:}$STRIGI_PLUGIN_PATH
-    export QT_PLUGIN_PATH=$i/lib/qt4/plugins:$i/lib/kde4/plugins${QT_PLUGIN_PATH:+:}$QT_PLUGIN_PATH
+    export QT_PLUGIN_PATH=$i/lib/qt4/plugins:$i/lib/kde4/plugins${QT_PLUGIN_PATH:+:}:$i/lib:$QT_PLUGIN_PATH
     export QTWEBKIT_PLUGIN_PATH=$i/lib/mozilla/plugins/${QTWEBKIT_PLUGIN_PATH:+:}$QTWEBKIT_PLUGIN_PATH
     export XDG_CONFIG_DIRS=$i/etc/xdg${XDG_CONFIG_DIRS:+:}$XDG_CONFIG_DIRS
     export XDG_DATA_DIRS=$i/share${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS
diff --git a/modules/services/x11/desktop-managers/kde4.nix b/modules/services/x11/desktop-managers/kde4.nix
index 309def66f20..145a8a23a56 100644
--- a/modules/services/x11/desktop-managers/kde4.nix
+++ b/modules/services/x11/desktop-managers/kde4.nix
@@ -109,6 +109,7 @@ in
           pkgs.kde4.kdebase # contains kde-workspace etc.
           pkgs.kde4.kde_wallpapers # contains kdm's default background
           pkgs.kde4.oxygen_icons
+          pkgs.virtuoso # to enable Nepomuk to find Virtuoso
 
           # Starts KDE's Polkit authentication agent.
           pkgs.kde4.polkit_kde_agent