From 919293492b7162227804b0a95030860af7afbc68 Mon Sep 17 00:00:00 2001 From: Constantine Glen Evans Date: Thu, 16 Apr 2020 11:21:46 -0700 Subject: [PATCH] ipe: fix Qt wrapping Uses mkDerivation instead of stdenv.mkDerivation, to fix Qt wrapping problem. --- pkgs/applications/graphics/ipe/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix index c6cf71cc67bc9..6a2a8dbc18fe9 100644 --- a/pkgs/applications/graphics/ipe/default.nix +++ b/pkgs/applications/graphics/ipe/default.nix @@ -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 { @@ -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;