summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorValentin Robert <valentin.robert.42@gmail.com>2017-05-18 16:43:38 -0700
committerValentin Robert <valentin.robert.42@gmail.com>2017-05-18 16:43:38 -0700
commiteaef55f69976f84dc16297f9f011984eb20c8b26 (patch)
tree123f5e1ae845fa13cd9c983892b3005056dd73a0 /pkgs
parentfc2caec7565bb536b6208d1e9eaba6b674c1f69a (diff)
downloadnixlib-eaef55f69976f84dc16297f9f011984eb20c8b26.tar
nixlib-eaef55f69976f84dc16297f9f011984eb20c8b26.tar.gz
nixlib-eaef55f69976f84dc16297f9f011984eb20c8b26.tar.bz2
nixlib-eaef55f69976f84dc16297f9f011984eb20c8b26.tar.lz
nixlib-eaef55f69976f84dc16297f9f011984eb20c8b26.tar.xz
nixlib-eaef55f69976f84dc16297f9f011984eb20c8b26.tar.zst
nixlib-eaef55f69976f84dc16297f9f011984eb20c8b26.zip
proofgeneral_HEAD: fix for files removed upstream
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix5
-rw-r--r--pkgs/applications/editors/emacs-modes/proofgeneral/pg.patch16
2 files changed, 0 insertions, 21 deletions
diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix b/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix
index 9e29bb9c4a6e..fd580ae9270c 100644
--- a/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix
+++ b/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix
@@ -18,16 +18,11 @@ stdenv.mkDerivation (rec {
            -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;
   '';
diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/pg.patch b/pkgs/applications/editors/emacs-modes/proofgeneral/pg.patch
deleted file mode 100644
index 704e4b6c8c7a..000000000000
--- a/pkgs/applications/editors/emacs-modes/proofgeneral/pg.patch
+++ /dev/null
@@ -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."