diff options
author | Thomas Tuegel <ttuegel@gmail.com> | 2016-04-21 14:33:04 -0500 |
---|---|---|
committer | Thomas Tuegel <ttuegel@gmail.com> | 2016-04-22 07:56:02 -0500 |
commit | 8b585cc9f555ac88970d8814641ad1488e8d9e9b (patch) | |
tree | 7d859bd2c7e01827f927d5a5b503ff560cfe1348 /nixos/modules/services/x11/desktop-managers/kde5.nix | |
parent | 685c34555ccd3d0eb07501783b7ca9d67e03aa18 (diff) | |
download | nixlib-8b585cc9f555ac88970d8814641ad1488e8d9e9b.tar nixlib-8b585cc9f555ac88970d8814641ad1488e8d9e9b.tar.gz nixlib-8b585cc9f555ac88970d8814641ad1488e8d9e9b.tar.bz2 nixlib-8b585cc9f555ac88970d8814641ad1488e8d9e9b.tar.lz nixlib-8b585cc9f555ac88970d8814641ad1488e8d9e9b.tar.xz nixlib-8b585cc9f555ac88970d8814641ad1488e8d9e9b.tar.zst nixlib-8b585cc9f555ac88970d8814641ad1488e8d9e9b.zip |
phonon: 4.8.3 -> 4.9.0
- Removed phonon-backend-vlc. - Moved qt5.phonon to kde5.phonon.
Diffstat (limited to 'nixos/modules/services/x11/desktop-managers/kde5.nix')
-rw-r--r-- | nixos/modules/services/x11/desktop-managers/kde5.nix | 36 |
1 files changed, 2 insertions, 34 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index 70dc1ac2a26a..f5d9d8b8e0db 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -22,26 +22,6 @@ in description = "Enable the Plasma 5 (KDE 5) desktop environment."; }; - phonon = { - - gstreamer = { - enable = mkOption { - type = types.bool; - default = true; - description = "Enable the GStreamer Phonon backend (recommended)."; - }; - }; - - vlc = { - enable = mkOption { - type = types.bool; - default = false; - description = "Enable the VLC Phonon backend."; - }; - }; - - }; - }; }; @@ -141,26 +121,14 @@ in ++ lib.optionals cfg.phonon.gstreamer.enable [ - pkgs.phonon_backend_gstreamer - pkgs.gst_all.gstreamer - pkgs.gst_all.gstPluginsBase - pkgs.gst_all.gstPluginsGood - pkgs.gst_all.gstPluginsUgly - pkgs.gst_all.gstPluginsBad - pkgs.gst_all.gstFfmpeg # for mp3 playback - pkgs.qt55.phonon-backend-gstreamer + 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 cfg.phonon.vlc.enable - [ - pkgs.phonon_qt5_backend_vlc - pkgs.qt55.phonon-backend-vlc ]; environment.pathsToLink = [ "/share" ]; |