Merge pull request #25905 from Ptival/proofgeneral-head

proofgeneral_HEAD: fix

Changed files
-21
pkgs
applications
editors
emacs-modes
proofgeneral
-5
pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix
···
-e "s|^\(\(DEST_\)\?PREFIX\)=.*$|\1=$out|g ; \
s|/sbin/install-info|install-info|g"
-
-
sed -i "bin/proofgeneral" -e's/which/type -p/g'
-
# @image{ProofGeneral} fails, so remove it.
sed -i '94d' doc/PG-adapting.texi
sed -i '96d' doc/ProofGeneral.texi
'';
-
-
patches = [ ./pg.patch ];
preBuild = ''
make clean;
···
-e "s|^\(\(DEST_\)\?PREFIX\)=.*$|\1=$out|g ; \
s|/sbin/install-info|install-info|g"
# @image{ProofGeneral} fails, so remove it.
sed -i '94d' doc/PG-adapting.texi
sed -i '96d' doc/ProofGeneral.texi
'';
preBuild = ''
make clean;
-16
pkgs/applications/editors/emacs-modes/proofgeneral/pg.patch
···
-
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/generic" ]; 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."
···