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

vlc_qt5: build with Qt 5.5

Browse Source
This commit is contained in:
Thomas Tuegel 2015-09-27 10:01:11 -05:00
parent 943c2bf059
commit c9a6d288b5
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,13 +8,14 @@
, libass, libva, libdvbpsi, libdc1394, libraw1394, libopus , libass, libva, libdvbpsi, libdc1394, libraw1394, libopus
, libvdpau, libsamplerate , libvdpau, libsamplerate
, onlyLibVLC ? false , onlyLibVLC ? false
, qt4 ? null, qt5 ? null, withQt5 ? false , qt4 ? null
, withQt5 ? false, qtbase ? null
, jackSupport ? false , jackSupport ? false
}: }:
with stdenv.lib; with stdenv.lib;
assert (withQt5 -> qt5 != null); assert (withQt5 -> qtbase != null);
assert (!withQt5 -> qt4 != null); assert (!withQt5 -> qt4 != null);
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -35,7 +36,7 @@ stdenv.mkDerivation rec {
xorg.xlibsWrapper xorg.libXv xorg.libXvMC xorg.libXpm xorg.xcbutilkeysyms xorg.xlibsWrapper xorg.libXv xorg.libXvMC xorg.libXpm xorg.xcbutilkeysyms
libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate
] ]
++ (if withQt5 then with qt5; [ base ] else [qt4]) ++ [(if withQt5 then qtbase else qt4)]
++ optional jackSupport libjack2; ++ optional jackSupport libjack2;
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];

9
pkgs/top-level/all-packages.nix
View File

@ -7916,6 +7916,11 @@ let
qca-qt5 = callPackage ../development/libraries/qca-qt5 { }; qca-qt5 = callPackage ../development/libraries/qca-qt5 { };
vlc = callPackage ../applications/video/vlc {
qt4 = null;
withQt5 = true;
};
}; };
qt55Libs = lib.makeScope qt55.newScope qt5LibsFun; qt55Libs = lib.makeScope qt55.newScope qt5LibsFun;
@ -13051,9 +13056,7 @@ let
ffmpeg = ffmpeg_2; ffmpeg = ffmpeg_2;
}; };
vlc_qt5 = vlc.override { vlc_qt5 = qt5Libs.vlc;
withQt5 = true;
};
vmpk = callPackage ../applications/audio/vmpk { }; vmpk = callPackage ../applications/audio/vmpk { };