ipe: use texlive-new

+14 -8
+10 -7
pkgs/applications/graphics/ipe/default.nix
··· 1 - { stdenv, fetchurl, pkgconfig, zlib, freetype, cairo, lua5, texLive, ghostscriptX 1 + { stdenv, fetchurl, pkgconfig, zlib, freetype, cairo, lua5, texlive, ghostscript 2 2 , libjpeg, qtbase 3 - , makeWrapper }: 4 - let ghostscript = ghostscriptX; in 3 + , makeQtWrapper 4 + }: 5 + 5 6 stdenv.mkDerivation rec { 6 7 name = "ipe-7.1.10"; 7 8 ··· 21 22 ''; 22 23 23 24 IPEPREFIX="$$out"; 24 - URWFONTDIR="${texLive}/texmf-dist/fonts/type1/urw/"; 25 + URWFONTDIR="${texlive}/texmf-dist/fonts/type1/urw/"; 25 26 LUA_PACKAGE = "lua"; 26 27 27 28 buildInputs = [ 28 - libjpeg pkgconfig zlib qtbase freetype cairo lua5 texLive ghostscript makeWrapper 29 + libjpeg pkgconfig zlib qtbase freetype cairo lua5 texlive ghostscript 29 30 ]; 30 31 31 - postInstall = '' 32 + nativeBuildInputs = [ makeQtWrapper ]; 33 + 34 + postFixup = '' 32 35 for prog in $out/bin/*; do 33 - wrapProgram "$prog" --prefix PATH : "${texLive}/bin" 36 + wrapQtProgram "$prog" --prefix PATH : "${texlive}/bin" 34 37 done 35 38 ''; 36 39
+4 -1
pkgs/top-level/all-packages.nix
··· 12165 12165 lua = lua5; 12166 12166 }; 12167 12167 12168 - ipe = qt5Libs.callPackage ../applications/graphics/ipe { }; 12168 + ipe = qt5Libs.callPackage ../applications/graphics/ipe { 12169 + ghostscript = ghostscriptX; 12170 + texlive = texlive.combine { inherit (texlive) scheme-small; }; 12171 + }; 12169 12172 12170 12173 iptraf = callPackage ../applications/networking/iptraf { }; 12171 12174