diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2016-04-22 16:00:25 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2016-04-25 19:04:24 -0500 |
| commit | 522ed7ce76cc081d31de155813cb66efaad4e1d8 (patch) | |
| tree | 00c4a57e3fedccc03fdbcba09b19f4c72c4f14bf /nixos/modules/services/x11 | |
| parent | 5896befee037fc570134cc75297a97fdad187fef (diff) | |
| download | nixlib-522ed7ce76cc081d31de155813cb66efaad4e1d8.tar nixlib-522ed7ce76cc081d31de155813cb66efaad4e1d8.tar.gz nixlib-522ed7ce76cc081d31de155813cb66efaad4e1d8.tar.bz2 nixlib-522ed7ce76cc081d31de155813cb66efaad4e1d8.tar.lz nixlib-522ed7ce76cc081d31de155813cb66efaad4e1d8.tar.xz nixlib-522ed7ce76cc081d31de155813cb66efaad4e1d8.tar.zst nixlib-522ed7ce76cc081d31de155813cb66efaad4e1d8.zip | |
nixos/kde5: phonon-backend-gstreamer is not optional
Diffstat (limited to 'nixos/modules/services/x11')
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/kde5.nix | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index c81046ac4405..f90f4dc856de 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -102,6 +102,15 @@ in pkgs.hicolor_icon_theme kde5.kde-gtk-config + + 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. @@ -120,19 +129,7 @@ in ++ lib.optional config.hardware.pulseaudio.enable kde5.plasma-pa ++ lib.optional config.powerManagement.enable kde5.powerdevil ++ lib.optional config.services.colord.enable kde5.colord-kde - ++ lib.optionals config.services.samba.enable [ kde5.kdenetwork-filesharing pkgs.samba ] - - ++ lib.optionals cfg.phonon.gstreamer.enable - [ - 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 - ]; + ++ lib.optionals config.services.samba.enable [ kde5.kdenetwork-filesharing pkgs.samba ]; environment.pathsToLink = [ "/share" ]; @@ -141,12 +138,9 @@ in target = "X11/xkb"; }; - environment.profileRelativeEnvVars = - mkIf cfg.phonon.gstreamer.enable - { - GST_PLUGIN_SYSTEM_PATH = [ "/lib/gstreamer-0.10" ]; - GST_PLUGIN_SYSTEM_PATH_1_0 = [ "/lib/gstreamer-1.0" ]; - }; + 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) { |