diff options
author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2014-09-28 14:00:14 +0100 |
---|---|---|
committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2014-09-28 14:03:15 +0100 |
commit | 94828070ed293043eefcde0ad179145c803eb6ef (patch) | |
tree | 48e05dd3efe09dbb4b0577ab0956cb40b3b45b7f | |
parent | f3b8d82ce683d38d11f29a6b82de11fc6259d3a0 (diff) | |
download | nixlib-94828070ed293043eefcde0ad179145c803eb6ef.tar nixlib-94828070ed293043eefcde0ad179145c803eb6ef.tar.gz nixlib-94828070ed293043eefcde0ad179145c803eb6ef.tar.bz2 nixlib-94828070ed293043eefcde0ad179145c803eb6ef.tar.lz nixlib-94828070ed293043eefcde0ad179145c803eb6ef.tar.xz nixlib-94828070ed293043eefcde0ad179145c803eb6ef.tar.zst nixlib-94828070ed293043eefcde0ad179145c803eb6ef.zip |
ProofGeneral: makes the dependency on TeXLive optional
And fixes the default value of $PGHOME
-rw-r--r-- | pkgs/applications/editors/emacs-modes/proofgeneral/4.3pre.nix | 11 | ||||
-rw-r--r-- | pkgs/applications/editors/emacs-modes/proofgeneral/pg.patch | 16 |
2 files changed, 24 insertions, 3 deletions
diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/4.3pre.nix b/pkgs/applications/editors/emacs-modes/proofgeneral/4.3pre.nix index 3a492dc0c7f4..32a036805edc 100644 --- a/pkgs/applications/editors/emacs-modes/proofgeneral/4.3pre.nix +++ b/pkgs/applications/editors/emacs-modes/proofgeneral/4.3pre.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, emacs, texinfo, texLive, perl, which, automake }: +{ stdenv, fetchurl, emacs, texinfo, texLive, perl, which, automake, enableDoc ? false }: stdenv.mkDerivation (rec { name = "ProofGeneral-4.3pre131011"; @@ -10,7 +10,7 @@ stdenv.mkDerivation (rec { sourceRoot = name; - buildInputs = [ emacs texinfo texLive perl which ]; + buildInputs = [ emacs texinfo perl which ] ++ stdenv.lib.optional enableDoc texLive; prePatch = '' sed -i "Makefile" \ @@ -25,15 +25,20 @@ stdenv.mkDerivation (rec { sed -i '96d' doc/ProofGeneral.texi ''; + patches = [ ./pg.patch ]; + preBuild = '' make clean; ''; installPhase = + if enableDoc + then # Copy `texinfo.tex' in the right place so that `texi2pdf' works. '' cp -v "${automake}/share/"automake-*/texinfo.tex doc make install install-doc - ''; + '' + else "make install"; meta = { description = "Proof General, an Emacs front-end for proof assistants"; diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/pg.patch b/pkgs/applications/editors/emacs-modes/proofgeneral/pg.patch new file mode 100644 index 000000000000..c733911118de --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/proofgeneral/pg.patch @@ -0,0 +1,16 @@ +diff -r c7d8bfff4c0a bin/proofgeneral +--- a/bin/proofgeneral Sat Sep 27 02:25:15 2014 +0100 ++++ b/bin/proofgeneral Sat Sep 27 02:28:16 2014 +0100 +@@ -73,11 +73,7 @@ + + # Try to find Proof General directory + if [ -z "$PGHOME" ] || [ ! -d "$PGHOME" ]; then +- # default relative to this script, otherwise PGHOMEDEFAULT +- MYDIR="`readlink --canonicalize "$0" | sed -ne 's,/bin/proofgeneral$,,p'`" +- if [ -d "$MYDIR" ]; then +- PGHOME="$MYDIR" +- elif [ -d "$PGHOMEDEFAULT" ]; then ++ if [ -d "$PGHOMEDEFAULT" ]; then + PGHOME="$PGHOMEDEFAULT" + else + echo "Cannot find the Proof General lisp files: Set PGHOME or use --pghome." |