mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-26 04:43:09 +03:00
proofgeneral_HEAD: fix for files removed upstream
This commit is contained in:
parent
fc2caec756
commit
eaef55f699
@ -18,16 +18,11 @@ stdenv.mkDerivation (rec {
|
|||||||
-e "s|^\(\(DEST_\)\?PREFIX\)=.*$|\1=$out|g ; \
|
-e "s|^\(\(DEST_\)\?PREFIX\)=.*$|\1=$out|g ; \
|
||||||
s|/sbin/install-info|install-info|g"
|
s|/sbin/install-info|install-info|g"
|
||||||
|
|
||||||
|
|
||||||
sed -i "bin/proofgeneral" -e's/which/type -p/g'
|
|
||||||
|
|
||||||
# @image{ProofGeneral} fails, so remove it.
|
# @image{ProofGeneral} fails, so remove it.
|
||||||
sed -i '94d' doc/PG-adapting.texi
|
sed -i '94d' doc/PG-adapting.texi
|
||||||
sed -i '96d' doc/ProofGeneral.texi
|
sed -i '96d' doc/ProofGeneral.texi
|
||||||
'';
|
'';
|
||||||
|
|
||||||
patches = [ ./pg.patch ];
|
|
||||||
|
|
||||||
preBuild = ''
|
preBuild = ''
|
||||||
make clean;
|
make clean;
|
||||||
'';
|
'';
|
||||||
|
@ -1,16 +0,0 @@
|
|||||||
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."
|
|
Loading…
Reference in New Issue
Block a user