public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/kde5: phonon-backend-gstreamer is not optional

Browse Source
This commit is contained in:
Thomas Tuegel 2016-04-22 16:00:25 -05:00
parent 5896befee0
commit 522ed7ce76
1 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
nixos/modules/services/x11/desktop-managers/kde5.nix
View File

@ -102,6 +102,15 @@ in
pkgs.hicolor_icon_theme pkgs.hicolor_icon_theme
kde5.kde-gtk-config 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. # 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.hardware.pulseaudio.enable kde5.plasma-pa
++ lib.optional config.powerManagement.enable kde5.powerdevil ++ lib.optional config.powerManagement.enable kde5.powerdevil
++ lib.optional config.services.colord.enable kde5.colord-kde ++ lib.optional config.services.colord.enable kde5.colord-kde
++ lib.optionals config.services.samba.enable [ kde5.kdenetwork-filesharing pkgs.samba ] ++ 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
];
environment.pathsToLink = [ "/share" ]; environment.pathsToLink = [ "/share" ];
@ -141,12 +138,9 @@ in
target = "X11/xkb"; target = "X11/xkb";
}; };
environment.profileRelativeEnvVars = environment.profileRelativeEnvVars = {
mkIf cfg.phonon.gstreamer.enable GST_PLUGIN_SYSTEM_PATH_1_0 = [ "/lib/gstreamer-1.0" ];
{ };
GST_PLUGIN_SYSTEM_PATH = [ "/lib/gstreamer-0.10" ];
GST_PLUGIN_SYSTEM_PATH_1_0 = [ "/lib/gstreamer-1.0" ];
};
# Enable GTK applications to load SVG icons # Enable GTK applications to load SVG icons
environment.variables = mkIf (lib.hasAttr "breeze-icons" kde5) { environment.variables = mkIf (lib.hasAttr "breeze-icons" kde5) {