Skip to content

Commit

Permalink
ipe: fix Qt wrapping
Browse files Browse the repository at this point in the history
Uses mkDerivation instead of stdenv.mkDerivation, to fix Qt wrapping problem.
  • Loading branch information
cgevans authored and Jon committed Apr 17, 2020
1 parent 3b8a98d commit 9192934
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions pkgs/applications/graphics/ipe/default.nix
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{ 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";

src = fetchurl {
Expand All @@ -20,13 +20,9 @@ stdenv.mkDerivation rec {
libjpeg libpng zlib qtbase freetype cairo lua5 texlive ghostscript
];

nativeBuildInputs = [ makeWrapper pkgconfig ];
nativeBuildInputs = [ pkgconfig ];

postFixup = ''
for prog in $out/bin/*; do
wrapProgram "$prog" --prefix PATH : "${texlive}/bin"
done
'';
qtWrapperArgs = [ ''--prefix PATH : ${texlive}/bin'' ];

enableParallelBuilding = true;

Expand Down

0 comments on commit 9192934

Please sign in to comment.