qt5: remove makeQtWrapper

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

View File

@@ -1,6 +1,5 @@
{ stdenv, fetchurl, pkgconfig, zlib, freetype, cairo, lua5, texlive, ghostscript
{ stdenv, fetchurl, makeWrapper, pkgconfig, zlib, freetype, cairo, lua5, texlive, ghostscript
, libjpeg, qtbase
, makeQtWrapper
}:
stdenv.mkDerivation rec {
@@ -28,14 +27,14 @@ stdenv.mkDerivation rec {
LUA_PACKAGE = "lua";
buildInputs = [
libjpeg pkgconfig zlib qtbase freetype cairo lua5 texlive ghostscript
libjpeg zlib qtbase freetype cairo lua5 texlive ghostscript
];
nativeBuildInputs = [ makeQtWrapper ];
nativeBuildInputs = [ makeWrapper pkgconfig ];
postFixup = ''
for prog in $out/bin/*; do
wrapQtProgram "$prog" --prefix PATH : "${texlive}/bin"
wrapProgram "$prog" --prefix PATH : "${texlive}/bin"
done
'';