From 006f7291e40eb28d881a248a2c0ef984197295d3 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Mon, 25 Oct 2010 01:46:30 +0000 Subject: [PATCH] Make Strigi indexing work in Nepomuk svn path=/nixos/trunk/; revision=24460 --- modules/programs/bash/bashrc.sh | 5 +++-- modules/services/x11/desktop-managers/kde4.nix | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/programs/bash/bashrc.sh b/modules/programs/bash/bashrc.sh index 8d1e4833a2d..37b87887e4f 100644 --- a/modules/programs/bash/bashrc.sh +++ b/modules/programs/bash/bashrc.sh @@ -17,8 +17,8 @@ NIX_USER_PROFILE_DIR=/nix/var/nix/profiles/per-user/$USER NIX_PROFILES="/var/run/current-system/sw /nix/var/nix/profiles/default $HOME/.nix-profile" -unset PATH INFOPATH PKG_CONFIG_PATH PERL5LIB GST_PLUGIN_PATH KDEDIRS -unset XDG_CONFIG_DIRS XDG_DATA_DIRS +unset PATH INFOPATH PKG_CONFIG_PATH PERL5LIB ALSA_PLUGIN_DIRS GST_PLUGIN_PATH KDEDIRS +unset QT_PLUGIN_PATH STRIGI_PLUGIN_PATH XDG_CONFIG_DIRS XDG_DATA_DIRS for i in $NIX_PROFILES; do # !!! reverse # We have to care not leaving an empty PATH element, because that means '.' to Linux @@ -38,6 +38,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 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 7f64609e406..0d088d8e970 100644 --- a/modules/services/x11/desktop-managers/kde4.nix +++ b/modules/services/x11/desktop-managers/kde4.nix @@ -57,6 +57,10 @@ in environment = { systemPackages = [ + # temporary workarounds + pkgs.shared_desktop_ontologies + pkgs.kde4.strigi + pkgs.kde4.kdelibs pkgs.kde4.kdebase pkgs.kde4.kdebase_runtime