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

Merge pull request #65518 from jokogr/f/vlc_use_wrapqtappshook 

vlc: use wrapQtAppsHook
This commit is contained in:
worldofpeace 2019-07-28 22:21:50 -04:00 committed by GitHub
parent 59f3cfa405 20b09bee14
commit d06d718264
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/video/vlc/default.nix
View File

@ -9,7 +9,7 @@
, libass, libva, libdvbpsi, libdc1394, libraw1394, libopus , libass, libva, libdvbpsi, libdc1394, libraw1394, libopus
, libvdpau, libsamplerate, live555, fluidsynth, wayland, wayland-protocols , libvdpau, libsamplerate, live555, fluidsynth, wayland, wayland-protocols
, onlyLibVLC ? false , onlyLibVLC ? false
, withQt5 ? true, qtbase ? null, qtsvg ? null, qtx11extras ? null , withQt5 ? true, qtbase ? null, qtsvg ? null, qtx11extras ? null, wrapQtAppsHook ? null
, jackSupport ? false , jackSupport ? false
, removeReferencesTo , removeReferencesTo
, chromecastSupport ? true, protobuf, libmicrodns , chromecastSupport ? true, protobuf, libmicrodns
@ -21,7 +21,7 @@
with stdenv.lib; with stdenv.lib;
assert (withQt5 -> qtbase != null && qtsvg != null && qtx11extras != null); assert (withQt5 -> qtbase != null && qtsvg != null && qtx11extras != null && wrapQtAppsHook != null);
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "vlc-${version}"; name = "vlc-${version}";
@ -49,7 +49,8 @@ stdenv.mkDerivation rec {
++ optional jackSupport libjack2 ++ optional jackSupport libjack2
++ optionals chromecastSupport [ protobuf libmicrodns ]; ++ optionals chromecastSupport [ protobuf libmicrodns ];
nativeBuildInputs = [ autoreconfHook perl pkgconfig removeReferencesTo ]; nativeBuildInputs = [ autoreconfHook perl pkgconfig removeReferencesTo ]
++ optionals withQt5 [ wrapQtAppsHook ];
enableParallelBuilding = true; enableParallelBuilding = true;