diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-12-11 12:47:00 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-12-11 12:47:00 +0000 |
| commit | ee04ffcb550809f7d97d709ff4ec709a21b30ab9 (patch) | |
| tree | 470bdb3f97b0ab18d3abeec3e1f59db7a4af34ed /pkgs/applications/science/logic/isabelle/settings.patch | |
| parent | 3f1a32c266f792290cb08c45ab40f22a43cb13cb (diff) | |
| parent | 97d4a54698a4dea4b57ec4124591d75a740ee44e (diff) | |
| download | nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.tar nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.tar.gz nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.tar.bz2 nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.tar.lz nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.tar.xz nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.tar.zst nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.zip | |
Updating from trunk. I resolved simple conflicts.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25061
Diffstat (limited to 'pkgs/applications/science/logic/isabelle/settings.patch')
| -rw-r--r-- | pkgs/applications/science/logic/isabelle/settings.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/applications/science/logic/isabelle/settings.patch b/pkgs/applications/science/logic/isabelle/settings.patch index 15a70944087b..dc9c611d4886 100644 --- a/pkgs/applications/science/logic/isabelle/settings.patch +++ b/pkgs/applications/science/logic/isabelle/settings.patch @@ -6,7 +6,7 @@ diff -Naur Isabelle2009-1/etc/settings Isabelle2009-1-patched/etc/settings # Poly/ML 5.x (automated settings) -POLY_HOME="$(type -p poly)"; [ -n "$POLY_HOME" ] && POLY_HOME="$(dirname "$POLY_HOME")" - ML_PLATFORM=$("$ISABELLE_HOME/lib/scripts/polyml-platform") + ML_PLATFORM="$ISABELLE_PLATFORM" -ML_HOME=$(choosefrom \ - "$ISABELLE_HOME/contrib/polyml/$ML_PLATFORM" \ - "$ISABELLE_HOME/../polyml/$ML_PLATFORM" \ |