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

qt5: remove makeQtWrapper

Browse Source
This commit is contained in:
Thomas Tuegel
2017-05-17 14:26:11 -05:00
parent 1607f51613
commit c816bbc8a8
92 changed files with 323 additions and 582 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/misc/rockbox-utility/default.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, libusb1
, qtbase, qttools, makeQtWrapper, qmake
, qtbase, qttools, makeWrapper, qmake
, withEspeak ? false, espeak ? null }:
stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libusb1 qtbase qttools ]
++ stdenv.lib.optional withEspeak espeak;
nativeBuildInputs = [ makeQtWrapper pkgconfig qmake ];
nativeBuildInputs = [ makeWrapper pkgconfig qmake ];
preConfigure = ''
cd rbutil/rbutilqt
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
install -Dm755 RockboxUtility $out/bin/rockboxutility
ln -s $out/bin/rockboxutility $out/bin/RockboxUtility
wrapQtProgram $out/bin/rockboxutility \
wrapProgram $out/bin/rockboxutility \
${stdenv.lib.optionalString withEspeak ''
--prefix PATH : ${espeak}/bin
''}