bomi: use wrapQtProgram

This commit is contained in:
Nikolay Amiantov
2016-04-13 16:09:40 +03:00
parent 74f7916a9a
commit e88a986ca4
+4 -7
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, perl, python, which, makeWrapper { stdenv, fetchurl, fetchFromGitHub, pkgconfig, perl, python, which, makeQtWrapper
, libX11, libxcb, mesa , libX11, libxcb, mesa
, qtbase, qtdeclarative, qtquickcontrols, qttools, qtx11extras , qtbase, qtdeclarative, qtquickcontrols, qttools, qtx11extras
, ffmpeg , ffmpeg
@@ -27,9 +27,6 @@ assert pulseSupport -> libpulseaudio != null;
assert cddaSupport -> libcdda != null; assert cddaSupport -> libcdda != null;
assert youtubeSupport -> youtube-dl != null; assert youtubeSupport -> youtube-dl != null;
let qtPath = makeSearchPath "lib/qt5/qml" [ qtdeclarative qtquickcontrols ];
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "bomi-${version}"; name = "bomi-${version}";
version = "0.9.11"; version = "0.9.11";
@@ -56,6 +53,7 @@ stdenv.mkDerivation rec {
libvdpau libvdpau
libva libva
libbluray libbluray
qtdeclarative
qtquickcontrols qtquickcontrols
] ]
++ optional jackSupport jack ++ optional jackSupport jack
@@ -74,8 +72,7 @@ stdenv.mkDerivation rec {
''; '';
postInstall = '' postInstall = ''
wrapProgram $out/bin/bomi \ wrapQtProgram $out/bin/bomi \
--set QML2_IMPORT_PATH ${qtPath} \
${optionalString youtubeSupport "--prefix PATH ':' '${youtube-dl}/bin'"} ${optionalString youtubeSupport "--prefix PATH ':' '${youtube-dl}/bin'"}
''; '';
@@ -87,7 +84,7 @@ stdenv.mkDerivation rec {
++ optional cddaSupport "--enable-cdda" ++ optional cddaSupport "--enable-cdda"
; ;
nativeBuildInputs = [ pkgconfig perl python which qttools makeWrapper ]; nativeBuildInputs = [ pkgconfig perl python which qttools makeQtWrapper ];
enableParallelBuilding = true; enableParallelBuilding = true;