rockboxutility: fix linking to Qt libs

+17 -5
+16 -4
pkgs/tools/misc/rockbox-utility/default.nix
··· 1 - { stdenv, fetchurl, libusb1, qt5 }: 1 + { stdenv, fetchurl, pkgconfig, libusb1 2 + , qtbase, qttools, makeQtWrapper, qmakeHook 3 + , withEspeak ? true, espeak ? null }: 2 4 3 5 stdenv.mkDerivation rec { 4 6 name = "rockbox-utility-${version}"; ··· 9 11 sha256 = "0k3ycga3b0jnj13whwiip2l0gx32l50pnbh7kfima87nq65aaa5w"; 10 12 }; 11 13 12 - buildInputs = [ libusb1 ] ++ (with qt5; [ qtbase qttools ]); 13 - nativeBuildInputs = [ qt5.qmakeHook ]; 14 + buildInputs = [ libusb1 qtbase qttools ] 15 + ++ stdenv.lib.optional withEspeak espeak; 16 + nativeBuildInputs = [ makeQtWrapper pkgconfig qmakeHook ]; 14 17 15 18 preConfigure = '' 16 19 cd rbutil/rbutilqt 17 20 ''; 18 21 19 22 installPhase = '' 20 - install -Dm755 RockboxUtility $out/bin/RockboxUtility 23 + runHook preInstall 24 + 25 + install -Dm755 RockboxUtility $out/bin/rockboxutility 26 + ln -s $out/bin/rockboxutility $out/bin/RockboxUtility 27 + wrapQtProgram $out/bin/rockboxutility \ 28 + ${stdenv.lib.optionalString withEspeak '' 29 + --prefix PATH : ${espeak}/bin 30 + ''} 31 + 32 + runHook postInstall 21 33 ''; 22 34 23 35 meta = with stdenv.lib; {
+1 -1
pkgs/top-level/all-packages.nix
··· 3834 3834 3835 3835 rlwrap = callPackage ../tools/misc/rlwrap { }; 3836 3836 3837 - rockbox_utility = callPackage ../tools/misc/rockbox-utility { }; 3837 + rockbox_utility = libsForQt5.callPackage ../tools/misc/rockbox-utility { }; 3838 3838 3839 3839 rosegarden = callPackage ../applications/audio/rosegarden { }; 3840 3840