diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2015-12-12 10:57:38 -0600 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-12-12 10:57:38 -0600 |
| commit | f7edf63b23e25305fbe6c77d75a87fba7891beb5 (patch) | |
| tree | a1f3bb8f12db72e3843ad4f5b6a2aeea8d939024 /pkgs/applications/graphics/ipe | |
| parent | 269ae2e29d1e25b98d6491fc0b5e14d0521c12b2 (diff) | |
| download | nixpkgs-f7edf63b23e25305fbe6c77d75a87fba7891beb5.tar nixpkgs-f7edf63b23e25305fbe6c77d75a87fba7891beb5.tar.gz nixpkgs-f7edf63b23e25305fbe6c77d75a87fba7891beb5.tar.bz2 nixpkgs-f7edf63b23e25305fbe6c77d75a87fba7891beb5.tar.lz nixpkgs-f7edf63b23e25305fbe6c77d75a87fba7891beb5.tar.xz nixpkgs-f7edf63b23e25305fbe6c77d75a87fba7891beb5.tar.zst nixpkgs-f7edf63b23e25305fbe6c77d75a87fba7891beb5.zip | |
ipe: use texlive-new
Diffstat (limited to 'pkgs/applications/graphics/ipe')
| -rw-r--r-- | pkgs/applications/graphics/ipe/default.nix | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix index 9f1f53abc5c..c1c1861cd3d 100644 --- a/pkgs/applications/graphics/ipe/default.nix +++ b/pkgs/applications/graphics/ipe/default.nix @@ -1,7 +1,8 @@ -{ stdenv, fetchurl, pkgconfig, zlib, freetype, cairo, lua5, texLive, ghostscriptX +{ stdenv, fetchurl, pkgconfig, zlib, freetype, cairo, lua5, texlive, ghostscript , libjpeg, qtbase -, makeWrapper }: -let ghostscript = ghostscriptX; in +, makeQtWrapper +}: + stdenv.mkDerivation rec { name = "ipe-7.1.10"; @@ -21,16 +22,18 @@ stdenv.mkDerivation rec { ''; IPEPREFIX="$$out"; - URWFONTDIR="${texLive}/texmf-dist/fonts/type1/urw/"; + URWFONTDIR="${texlive}/texmf-dist/fonts/type1/urw/"; LUA_PACKAGE = "lua"; buildInputs = [ - libjpeg pkgconfig zlib qtbase freetype cairo lua5 texLive ghostscript makeWrapper + libjpeg pkgconfig zlib qtbase freetype cairo lua5 texlive ghostscript ]; - postInstall = '' + nativeBuildInputs = [ makeQtWrapper ]; + + postFixup = '' for prog in $out/bin/*; do - wrapProgram "$prog" --prefix PATH : "${texLive}/bin" + wrapQtProgram "$prog" --prefix PATH : "${texlive}/bin" done ''; |