From 66f306ac4ec855184ff079427f5ad48144b43396 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 10 May 2008 09:19:50 +0000
Subject: [PATCH] Removing tetex reference in E Prover
svn path=/nixpkgs/trunk/; revision=11810
---
pkgs/tools/misc/eProver/default.nix | 6 ++++--
pkgs/top-level/all-packages.nix | 11 ++++++++---
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/pkgs/tools/misc/eProver/default.nix b/pkgs/tools/misc/eProver/default.nix
index 1649a35004fc..0b21dfd78cde 100644
--- a/pkgs/tools/misc/eProver/default.nix
+++ b/pkgs/tools/misc/eProver/default.nix
@@ -9,12 +9,14 @@ stdenv.mkDerivation {
sha256 = "1zm1xip840hlam60kqk6xf0ikvyk7ch3ql1ac6wb68dx2l6hyhxv";
};
- buildInputs =[which tetex];
+ buildInputs =[which texLive];
preConfigure = "sed -e 's@^EXECPATH\\s.*@EXECPATH = '\$out'/bin@' -i Makefile.vars";
buildPhase = "make install";
- installCommand = "mkdir -p \$out/bin; make install-exec; make documentation ;
+
+ # HOME=. allows to build missing TeX formats
+ installCommand = "mkdir -p \$out/bin; make install-exec; HOME=. make documentation ;
mkdir -p \$out/share/doc ; cp -r DOC \$out/share/doc/EProver;
echo eproof -xAuto --tstp-in --tstp-out '\"\$@\"' >\$out/bin/eproof-tptp;
chmod a+x \$out/bin/eproof-tptp; ";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e2bb07407349..89e1cbab9f44 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -557,9 +557,14 @@ let pkgs = rec {
inherit fetchurl stdenv;
};
- eprover = import ../tools/misc/eProver {
- inherit fetchurl stdenv which tetex;
- };
+ eprover = composedArgsAndFun (import ../tools/misc/eProver) {
+ inherit fetchurl stdenv which;
+ texLive = texLiveAggregationFun {
+ paths = [
+ texLive texLiveExtra
+ ];
+ } null;
+ } null;
exif = import ../tools/graphics/exif {
inherit fetchurl stdenv pkgconfig libexif popt;