rockboxutility: fix linking to Qt libs

This commit is contained in:
Peter Hoeg 2017-05-02 14:34:40 +08:00
parent d08c717eff
commit 13bca4ba2d
2 changed files with 17 additions and 5 deletions

View File

@ -1,4 +1,6 @@
{ stdenv, fetchurl, libusb1, qt5 }: { stdenv, fetchurl, pkgconfig, libusb1
, qtbase, qttools, makeQtWrapper, qmakeHook
, withEspeak ? true, espeak ? null }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "rockbox-utility-${version}"; name = "rockbox-utility-${version}";
@ -9,15 +11,25 @@ stdenv.mkDerivation rec {
sha256 = "0k3ycga3b0jnj13whwiip2l0gx32l50pnbh7kfima87nq65aaa5w"; sha256 = "0k3ycga3b0jnj13whwiip2l0gx32l50pnbh7kfima87nq65aaa5w";
}; };
buildInputs = [ libusb1 ] ++ (with qt5; [ qtbase qttools ]); buildInputs = [ libusb1 qtbase qttools ]
nativeBuildInputs = [ qt5.qmakeHook ]; ++ stdenv.lib.optional withEspeak espeak;
nativeBuildInputs = [ makeQtWrapper pkgconfig qmakeHook ];
preConfigure = '' preConfigure = ''
cd rbutil/rbutilqt cd rbutil/rbutilqt
''; '';
installPhase = '' installPhase = ''
install -Dm755 RockboxUtility $out/bin/RockboxUtility runHook preInstall
install -Dm755 RockboxUtility $out/bin/rockboxutility
ln -s $out/bin/rockboxutility $out/bin/RockboxUtility
wrapQtProgram $out/bin/rockboxutility \
${stdenv.lib.optionalString withEspeak ''
--prefix PATH : ${espeak}/bin
''}
runHook postInstall
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

View File

@ -3834,7 +3834,7 @@ with pkgs;
rlwrap = callPackage ../tools/misc/rlwrap { }; rlwrap = callPackage ../tools/misc/rlwrap { };
rockbox_utility = callPackage ../tools/misc/rockbox-utility { }; rockbox_utility = libsForQt5.callPackage ../tools/misc/rockbox-utility { };
rosegarden = callPackage ../applications/audio/rosegarden { }; rosegarden = callPackage ../applications/audio/rosegarden { };