diff options
| author | Marco Maggesi <maggesi@math.unifi.it> | 2011-05-14 21:09:57 +0000 |
|---|---|---|
| committer | Marco Maggesi <maggesi@math.unifi.it> | 2011-05-14 21:09:57 +0000 |
| commit | 8e5beab31fadcfde003ae94a84fe89f3f2244290 (patch) | |
| tree | 3bb46c0f98f7ea46a726fb2f9c3e7f63778e5a5d | |
| parent | 503f04ca546da08c7479ba5ae5730a235df06c3b (diff) | |
| download | nixpkgs-8e5beab31fadcfde003ae94a84fe89f3f2244290.tar nixpkgs-8e5beab31fadcfde003ae94a84fe89f3f2244290.tar.gz nixpkgs-8e5beab31fadcfde003ae94a84fe89f3f2244290.tar.bz2 nixpkgs-8e5beab31fadcfde003ae94a84fe89f3f2244290.tar.lz nixpkgs-8e5beab31fadcfde003ae94a84fe89f3f2244290.tar.xz nixpkgs-8e5beab31fadcfde003ae94a84fe89f3f2244290.tar.zst nixpkgs-8e5beab31fadcfde003ae94a84fe89f3f2244290.zip | |
Fix building of Isabelle2011
svn path=/nixpkgs/trunk/; revision=27253
| -rw-r--r-- | pkgs/applications/science/logic/isabelle/settings.patch | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/pkgs/applications/science/logic/isabelle/settings.patch b/pkgs/applications/science/logic/isabelle/settings.patch index dc9c611d488..bf509a4bac4 100644 --- a/pkgs/applications/science/logic/isabelle/settings.patch +++ b/pkgs/applications/science/logic/isabelle/settings.patch @@ -1,34 +1,32 @@ -diff -Naur Isabelle2009-1/etc/settings Isabelle2009-1-patched/etc/settings ---- Isabelle2009-1/etc/settings 2009-12-02 12:04:07.000000000 +0100 -+++ Isabelle2009-1-patched/etc/settings 2009-12-04 16:15:40.000000000 +0100 -@@ -16,15 +16,8 @@ - # Only one of the sections below should be activated. +diff -Nuar Isabelle2011/etc/settings Isabelle2011-fix/etc/settings +--- Isabelle2011/etc/settings 2011-01-30 13:02:18.000000000 +0100 ++++ Isabelle2011-fix/etc/settings 2011-05-14 22:56:04.000000000 +0200 +@@ -17,13 +17,7 @@ # Poly/ML 5.x (automated settings) --POLY_HOME="$(type -p poly)"; [ -n "$POLY_HOME" ] && POLY_HOME="$(dirname "$POLY_HOME")" ML_PLATFORM="$ISABELLE_PLATFORM" --ML_HOME=$(choosefrom \ +-ML_HOME="$(choosefrom \ - "$ISABELLE_HOME/contrib/polyml/$ML_PLATFORM" \ - "$ISABELLE_HOME/../polyml/$ML_PLATFORM" \ - "/usr/local/polyml/$ML_PLATFORM" \ - "/usr/share/polyml/$ML_PLATFORM" \ - "/opt/polyml/$ML_PLATFORM" \ -- $POLY_HOME) +- "")" +ML_HOME=@ML_HOME@ ML_SYSTEM=$("$ISABELLE_HOME/lib/scripts/polyml-version") ML_OPTIONS="-H 200" ML_SOURCES="$ML_HOME/../src" -@@ -185,13 +178,7 @@ +@@ -175,13 +169,7 @@ ### # Proof General home, look in a variety of places --PROOFGENERAL_HOME=$(choosefrom \ +-PROOFGENERAL_HOME="$(choosefrom \ - "$ISABELLE_HOME/contrib/ProofGeneral" \ - "$ISABELLE_HOME/../ProofGeneral" \ - "/usr/local/ProofGeneral" \ - "/usr/share/ProofGeneral" \ - "/opt/ProofGeneral" \ -- "") +- "")" +PROOFGENERAL_HOME=@PROOFGENERAL_HOME@ PROOFGENERAL_OPTIONS="" |