ipe: fix Qt wrapping
Uses mkDerivation instead of stdenv.mkDerivation, to fix Qt wrapping problem.
This commit is contained in:
parent
3b8a98d639
commit
919293492b
@ -1,8 +1,8 @@
|
|||||||
{ stdenv, fetchurl, makeWrapper, pkgconfig, zlib, freetype, cairo, lua5, texlive, ghostscript
|
{ stdenv, fetchurl, makeWrapper, pkgconfig, zlib, freetype, cairo, lua5, texlive, ghostscript
|
||||||
, libjpeg, libpng, qtbase
|
, libjpeg, libpng, qtbase, mkDerivation
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
mkDerivation rec {
|
||||||
name = "ipe-7.2.13";
|
name = "ipe-7.2.13";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
@ -20,13 +20,9 @@ stdenv.mkDerivation rec {
|
|||||||
libjpeg libpng zlib qtbase freetype cairo lua5 texlive ghostscript
|
libjpeg libpng zlib qtbase freetype cairo lua5 texlive ghostscript
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper pkgconfig ];
|
nativeBuildInputs = [ pkgconfig ];
|
||||||
|
|
||||||
postFixup = ''
|
qtWrapperArgs = [ ''--prefix PATH : ${texlive}/bin'' ];
|
||||||
for prog in $out/bin/*; do
|
|
||||||
wrapProgram "$prog" --prefix PATH : "${texlive}/bin"
|
|
||||||
done
|
|
||||||
'';
|
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user