summary refs log tree commit diff
path: root/pkgs/top-level/all-packages.nix
diff options
context:
space:
mode:
authorxeji <36407913+xeji@users.noreply.github.com>2018-06-26 18:26:14 +0200
committerGitHub <noreply@github.com>2018-06-26 18:26:14 +0200
commit6c0427e8ec94b23243c71f60cd4b92af470c0697 (patch)
treeae40cdbe0cec80bbc582922afee8e093bf473ae8 /pkgs/top-level/all-packages.nix
parenta627399a84f06251fc88030bde1b571f82121993 (diff)
parentd8560227926cea4d41e4360fd54b819025810eb9 (diff)
downloadnixpkgs-6c0427e8ec94b23243c71f60cd4b92af470c0697.tar
nixpkgs-6c0427e8ec94b23243c71f60cd4b92af470c0697.tar.gz
nixpkgs-6c0427e8ec94b23243c71f60cd4b92af470c0697.tar.bz2
nixpkgs-6c0427e8ec94b23243c71f60cd4b92af470c0697.tar.lz
nixpkgs-6c0427e8ec94b23243c71f60cd4b92af470c0697.tar.xz
nixpkgs-6c0427e8ec94b23243c71f60cd4b92af470c0697.tar.zst
nixpkgs-6c0427e8ec94b23243c71f60cd4b92af470c0697.zip
Merge pull request #42586 from Ma27/phonon-qt5-by-default
phonon-backend-vlc: use qt5 by default
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r--pkgs/top-level/all-packages.nix5
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 53695108166..85fa455d56d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11196,7 +11196,10 @@ with pkgs;
 
   phonon-backend-gstreamer = callPackage ../development/libraries/phonon/backends/gstreamer.nix {};
 
-  phonon-backend-vlc = callPackage ../development/libraries/phonon/backends/vlc.nix {};
+  # TODO(@Ma27) get rid of that as soon as QT4 can be dropped
+  phonon-backend-vlc = callPackage ../development/libraries/phonon/backends/vlc.nix {
+    withQt4 = true;
+  };
 
   inherit (callPackage ../development/libraries/physfs { })
     physfs_2