diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2015-12-19 20:13:45 -0600 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-12-20 07:56:43 -0600 |
| commit | d40531639899805efd9ecbcd04ce11062bb59a39 (patch) | |
| tree | d2dab636560e1e1dbebaacfbac68351ca4fc7461 /pkgs/applications/video | |
| parent | 0b303f6edd1e1c24fb7659d56796d871f8c727db (diff) | |
| download | nixpkgs-d40531639899805efd9ecbcd04ce11062bb59a39.tar nixpkgs-d40531639899805efd9ecbcd04ce11062bb59a39.tar.gz nixpkgs-d40531639899805efd9ecbcd04ce11062bb59a39.tar.bz2 nixpkgs-d40531639899805efd9ecbcd04ce11062bb59a39.tar.lz nixpkgs-d40531639899805efd9ecbcd04ce11062bb59a39.tar.xz nixpkgs-d40531639899805efd9ecbcd04ce11062bb59a39.tar.zst nixpkgs-d40531639899805efd9ecbcd04ce11062bb59a39.zip | |
bomi: Qt 5 infrastructure update
Diffstat (limited to 'pkgs/applications/video')
| -rw-r--r-- | pkgs/applications/video/bomi/default.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/applications/video/bomi/default.nix b/pkgs/applications/video/bomi/default.nix index da07458f4f6..36da9d32072 100644 --- a/pkgs/applications/video/bomi/default.nix +++ b/pkgs/applications/video/bomi/default.nix @@ -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; |