summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorThomas Tuegel <ttuegel@gmail.com>2015-12-20 08:11:52 -0600
committerThomas Tuegel <ttuegel@gmail.com>2015-12-20 08:11:52 -0600
commit5ff1c586066501a4aa1083fb43838340cf1233c0 (patch)
tree2ae1fd463b91afe44031541dab7fc3226980fcc2 /nixos
parent78b876f600b3399a128733e1fce6ab54f3cbbf28 (diff)
parent298c4befda449f0b158a85efe16219fbe716c02d (diff)
downloadnixpkgs-5ff1c586066501a4aa1083fb43838340cf1233c0.tar
nixpkgs-5ff1c586066501a4aa1083fb43838340cf1233c0.tar.gz
nixpkgs-5ff1c586066501a4aa1083fb43838340cf1233c0.tar.bz2
nixpkgs-5ff1c586066501a4aa1083fb43838340cf1233c0.tar.lz
nixpkgs-5ff1c586066501a4aa1083fb43838340cf1233c0.tar.xz
nixpkgs-5ff1c586066501a4aa1083fb43838340cf1233c0.tar.zst
nixpkgs-5ff1c586066501a4aa1083fb43838340cf1233c0.zip
Merge pull request #11839 from ttuegel/qt-5.4
Qt infrastructure update
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/x11/desktop-managers/kde5.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix
index 933efa08fa3..2aeb4f67d77 100644
--- a/nixos/modules/services/x11/desktop-managers/kde5.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde5.nix
@@ -135,7 +135,7 @@ in
           pkgs.gst_all.gstPluginsUgly
           pkgs.gst_all.gstPluginsBad
           pkgs.gst_all.gstFfmpeg # for mp3 playback
-          pkgs.phonon_qt5_backend_gstreamer
+          pkgs.qt55.phonon-backend-gstreamer
           pkgs.gst_all_1.gstreamer
           pkgs.gst_all_1.gst-plugins-base
           pkgs.gst_all_1.gst-plugins-good
@@ -147,7 +147,7 @@ in
       ++ lib.optionals cfg.phonon.vlc.enable
         [
           pkgs.phonon_qt5_backend_vlc
-          pkgs.phonon_backend_vlc
+          pkgs.qt55.phonon-backend-vlc
         ];
 
     environment.pathsToLink = [ "/share" ];