From 3d87a133a092629426cbf67061917a9fb4936594 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Wed, 3 Mar 2010 13:22:06 +0000 Subject: [PATCH] Added gstreamer plugins to the systemPackages, so that Phonon does not crash on shutdown when using KDE 4.4.x svn path=/nixos/trunk/; revision=20350 --- modules/programs/bash/bashrc.sh | 1 + modules/services/x11/desktop-managers/kde4.nix | 3 +++ 2 files changed, 4 insertions(+) diff --git a/modules/programs/bash/bashrc.sh b/modules/programs/bash/bashrc.sh index 7bb7cef5bbe..f12b95637b4 100644 --- a/modules/programs/bash/bashrc.sh +++ b/modules/programs/bash/bashrc.sh @@ -11,6 +11,7 @@ export NIXPKGS_ALL=/etc/nixos/nixpkgs export PAGER="less -R" export EDITOR=nano export LOCATE_PATH=/var/cache/locatedb +export GST_PLUGIN_PATH=/var/run/current-system/sw/lib/gstreamer-0.10 @shellInit@ diff --git a/modules/services/x11/desktop-managers/kde4.nix b/modules/services/x11/desktop-managers/kde4.nix index a4c63616347..885ecfebca2 100644 --- a/modules/services/x11/desktop-managers/kde4.nix +++ b/modules/services/x11/desktop-managers/kde4.nix @@ -52,6 +52,9 @@ in pkgs.kde4.kdebase_runtime pkgs.kde4.kdebase_workspace pkgs.shared_mime_info + pkgs.gst_all.gstreamer + pkgs.gst_all.gstPluginsBase + pkgs.gst_all.gstPluginsGood ] ++ optional (pkgs.kde4 ? oxygen_icons) pkgs.kde4.oxygen_icons; environment.x11Packages =