eukleides: specify texlive dependencies instead of buildInputs
This commit is contained in:
parent
5047c27e2a
commit
190ba6ee72
2 changed files with 5 additions and 15 deletions
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, bison, flex, makeWrapper, texinfo, readline, texLive }:
|
||||
{ lib, stdenv, fetchurl, bison, flex, makeWrapper, texinfo, readline, texlive }:
|
||||
|
||||
lib.fix (eukleides: stdenv.mkDerivation rec {
|
||||
pname = "eukleides";
|
||||
|
@ -14,7 +14,7 @@ lib.fix (eukleides: stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ bison flex texinfo makeWrapper ];
|
||||
|
||||
buildInputs = [ readline texLive ];
|
||||
buildInputs = [ readline ];
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace Makefile \
|
||||
|
@ -32,21 +32,12 @@ lib.fix (eukleides: stdenv.mkDerivation rec {
|
|||
mkdir -p $out/bin
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/euktoeps \
|
||||
--set-default TEXINPUTS : \
|
||||
--prefix TEXINPUTS : "$tex/tex/latex/eukleides" \
|
||||
--prefix PATH : "${texLive}/bin"
|
||||
wrapProgram $out/bin/euktopdf \
|
||||
--set-default TEXINPUTS : \
|
||||
--prefix TEXINPUTS : "$tex/tex/latex/eukleides" \
|
||||
--prefix PATH : "${texLive}/bin"
|
||||
'';
|
||||
|
||||
outputs = [ "out" "doc" "tex" ];
|
||||
|
||||
passthru.tlType = "run";
|
||||
passthru.pkgs = [ eukleides.tex ];
|
||||
passthru.pkgs = [ eukleides.tex ]
|
||||
# packages needed by euktoeps, euktopdf and eukleides.sty
|
||||
++ (with texlive; collection-pstricks.pkgs ++ epstopdf.pkgs ++ iftex.pkgs ++ moreverb.pkgs);
|
||||
|
||||
meta = {
|
||||
description = "Geometry Drawing Language";
|
||||
|
|
|
@ -29828,7 +29828,6 @@ in
|
|||
ecm = callPackage ../applications/science/math/ecm { };
|
||||
|
||||
eukleides = callPackage ../applications/science/math/eukleides {
|
||||
texLive = texlive.combine { inherit (texlive) scheme-small; };
|
||||
texinfo = texinfo4;
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue