Author: maggesi
Date: Sat May 14 21:09:57 2011
New Revision: 27253
URL: https://svn.nixos.org/websvn/nix/?rev=27253&sc=1
Log:
Fix building of Isabelle2011
Modified:
nixpkgs/trunk/pkgs/applications/science/logic/isabelle/settings.patch
Modified: nixpkgs/trunk/pkgs/applications/science/logic/isabelle/settings.patch
==============================================================================
--- nixpkgs/trunk/pkgs/applications/science/logic/isabelle/settings.patch
Sat May 14 20:59:53 2011 (r27252)
+++ nixpkgs/trunk/pkgs/applications/science/logic/isabelle/settings.patch
Sat May 14 21:09:57 2011 (r27253)
@@ -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=""
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
