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

bomi: Qt 5 infrastructure update

Browse Source
This commit is contained in:
Thomas Tuegel 2015-12-19 20:13:45 -06:00
parent 0b303f6edd
commit d405316398
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/video/bomi/default.nix
View File

@ -1,5 +1,6 @@
{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, perl, python, which, makeWrapper
, libX11, libxcb, qt5, mesa
, libX11, libxcb, mesa
, qtbase, qtdeclarative, qtquickcontrols, qttools, qtx11extras
, ffmpeg
, libchardet
, mpg123
@ -26,7 +27,7 @@ assert pulseSupport -> libpulseaudio != null;
assert cddaSupport -> libcdda != null;
assert youtubeSupport -> youtube-dl != null;
let qtPath = makeSearchPath "lib/qt5/qml" [ qt5.declarative qt5.quickcontrols ];
let qtPath = makeSearchPath "lib/qt5/qml" [ qtdeclarative qtquickcontrols ];
in
stdenv.mkDerivation rec {
@ -42,7 +43,7 @@ stdenv.mkDerivation rec {
buildInputs = with stdenv.lib;
[ libX11 libxcb mesa
qt5.base qt5.x11extras
qtbase qtx11extras
ffmpeg
libchardet
mpg123
@ -85,7 +86,7 @@ stdenv.mkDerivation rec {
++ optional cddaSupport "--enable-cdda"
;
nativeBuildInputs = [ pkgconfig perl python which qt5.tools makeWrapper ];
nativeBuildInputs = [ pkgconfig perl python which qttools makeWrapper ];
enableParallelBuilding = true;

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

@ -11234,7 +11234,7 @@ let
cmatrix = callPackage ../applications/misc/cmatrix { };
bomi = callPackage ../applications/video/bomi {
bomi = qt5.callPackage ../applications/video/bomi {
youtube-dl = pythonPackages.youtube-dl;
pulseSupport = config.pulseaudio or true;
};