diff options
| author | Constantine Glen Evans <cevans@evanslabs.org> | 2020-04-16 11:21:46 -0700 |
|---|---|---|
| committer | Jon <jonringer@users.noreply.github.com> | 2020-04-16 20:31:22 -0700 |
| commit | 919293492b7162227804b0a95030860af7afbc68 (patch) | |
| tree | 0afa3330ae2c6d600a1081634eff5a9b9af287eb | |
| parent | 3b8a98d6393d778bd3b36b65b81ed1fb5c9abe42 (diff) | |
| download | nixpkgs-919293492b7162227804b0a95030860af7afbc68.tar nixpkgs-919293492b7162227804b0a95030860af7afbc68.tar.gz nixpkgs-919293492b7162227804b0a95030860af7afbc68.tar.bz2 nixpkgs-919293492b7162227804b0a95030860af7afbc68.tar.lz nixpkgs-919293492b7162227804b0a95030860af7afbc68.tar.xz nixpkgs-919293492b7162227804b0a95030860af7afbc68.tar.zst nixpkgs-919293492b7162227804b0a95030860af7afbc68.zip | |
ipe: fix Qt wrapping
Uses mkDerivation instead of stdenv.mkDerivation, to fix Qt wrapping problem.
| -rw-r--r-- | pkgs/applications/graphics/ipe/default.nix | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix index c6cf71cc67b..6a2a8dbc18f 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; |