summary refs log tree commit diff
path: root/nixos/modules/services/x11/desktop-managers
diff options
context:
space:
mode:
authorThomas Tuegel <ttuegel@gmail.com>2016-04-30 12:16:52 -0500
committerThomas Tuegel <ttuegel@gmail.com>2016-04-30 12:22:01 -0500
commit370120bd5f0b0d95af6d123653a3a3dfc358111b (patch)
tree19d811a7e30477f555e0780704dd24f35084b147 /nixos/modules/services/x11/desktop-managers
parentbad36556fe33c5500a69136858b86771c569bbd2 (diff)
downloadnixlib-370120bd5f0b0d95af6d123653a3a3dfc358111b.tar
nixlib-370120bd5f0b0d95af6d123653a3a3dfc358111b.tar.gz
nixlib-370120bd5f0b0d95af6d123653a3a3dfc358111b.tar.bz2
nixlib-370120bd5f0b0d95af6d123653a3a3dfc358111b.tar.lz
nixlib-370120bd5f0b0d95af6d123653a3a3dfc358111b.tar.xz
nixlib-370120bd5f0b0d95af6d123653a3a3dfc358111b.tar.zst
nixlib-370120bd5f0b0d95af6d123653a3a3dfc358111b.zip
kde5: don't install GStreamer modules system-wide
Diffstat (limited to 'nixos/modules/services/x11/desktop-managers')
-rw-r--r--nixos/modules/services/x11/desktop-managers/kde5.nix29
1 files changed, 16 insertions, 13 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix
index 56b45609a2cd..2e9183da970a 100644
--- a/nixos/modules/services/x11/desktop-managers/kde5.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde5.nix
@@ -105,12 +105,6 @@ in
 
         pkgs.phonon-backend-gstreamer
         pkgs.kde5.phonon-backend-gstreamer
-        pkgs.gst_all_1.gstreamer
-        pkgs.gst_all_1.gst-plugins-base
-        pkgs.gst_all_1.gst-plugins-good
-        pkgs.gst_all_1.gst-plugins-ugly
-        pkgs.gst_all_1.gst-plugins-bad
-        pkgs.gst_all_1.gst-libav # for mp3 playback
       ]
 
       # Plasma 5.5 and later has a Breeze GTK theme.
@@ -138,14 +132,23 @@ in
       target = "X11/xkb";
     };
 
-    environment.profileRelativeEnvVars = {
-      GST_PLUGIN_SYSTEM_PATH_1_0 = [ "/lib/gstreamer-1.0" ];
-    };
-
     # Enable GTK applications to load SVG icons
-    environment.variables = mkIf (lib.hasAttr "breeze-icons" kde5) {
-      GDK_PIXBUF_MODULE_FILE = "${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache";
-    };
+    environment.variables =
+      {
+        GST_PLUGIN_SYSTEM_PATH_1_0 =
+          lib.makeSearchPath "/lib/gstreamer-1.0"
+          (builtins.map (pkg: pkg.out) (with pkgs.gst_all_1; [
+            gstreamer
+            gst-plugins-base
+            gst-plugins-good
+            gst-plugins-ugly
+            gst-plugins-bad
+            gst-libav # for mp3 playback
+          ]));
+      }
+      // (if (lib.hasAttr "breeze-icons" kde5)
+          then { GDK_PIXBUF_MODULE_FILE = "${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"; }
+          else { });
 
     fonts.fonts = [ (kde5.oxygen-fonts or pkgs.noto-fonts) ];