diff options
| author | Marco Maggesi <maggesi@math.unifi.it> | 2010-12-23 19:28:06 +0000 |
|---|---|---|
| committer | Marco Maggesi <maggesi@math.unifi.it> | 2010-12-23 19:28:06 +0000 |
| commit | 51d6c8df916ae9fe482655af84562faa0dcd72c6 (patch) | |
| tree | e518bdc28404069888f888fad2eefbe6092f544c /pkgs/applications/science/logic/hol_light | |
| parent | 8e81fd9ee8507dff08e6689cb1f9ba5ad38e89da (diff) | |
| download | nixpkgs-51d6c8df916ae9fe482655af84562faa0dcd72c6.tar nixpkgs-51d6c8df916ae9fe482655af84562faa0dcd72c6.tar.gz nixpkgs-51d6c8df916ae9fe482655af84562faa0dcd72c6.tar.bz2 nixpkgs-51d6c8df916ae9fe482655af84562faa0dcd72c6.tar.lz nixpkgs-51d6c8df916ae9fe482655af84562faa0dcd72c6.tar.xz nixpkgs-51d6c8df916ae9fe482655af84562faa0dcd72c6.tar.zst nixpkgs-51d6c8df916ae9fe482655af84562faa0dcd72c6.zip | |
* Handle variable createFindlibDestdir correctly in ocaml-findlib
* Fix HOL Light derivation svn path=/nixpkgs/trunk/; revision=25269
Diffstat (limited to 'pkgs/applications/science/logic/hol_light')
| -rw-r--r-- | pkgs/applications/science/logic/hol_light/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index 932412daf75..f923095f857 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -1,4 +1,4 @@ -{stdenv, writeText, writeTextFile, ocaml, camlp5_transitional, hol_light_sources}: +{stdenv, writeText, writeTextFile, ocaml, findlib, camlp5_transitional, hol_light_sources}: let version = hol_light_sources.version; @@ -10,11 +10,11 @@ let pa_j_cmo = stdenv.mkDerivation { name = "pa_j.cmo"; inherit ocaml camlp5; - buildInputs = [ ocaml camlp5 ]; + buildInputs = [ ocaml camlp5 findlib ]; buildCommand = '' ocamlc -c \ -pp "camlp5r pa_lexer.cmo pa_extend.cmo q_MLast.cmo" \ - -I "${camlp5}/lib/ocaml/camlp5" \ + -I "$(ocamlfind query camlp5)" \ -o $out \ "${hol_light_src_dir}/pa_j_`ocamlc -version | cut -c1-4`.ml" ''; @@ -22,7 +22,7 @@ let start_ml = writeText "start.ml" '' Topdirs.dir_directory "${hol_light_src_dir}";; - Topdirs.dir_directory "${camlp5}/lib/ocaml/camlp5";; + Topdirs.dir_directory ("${camlp5}/lib/ocaml/"^Sys.ocaml_version^"/site-lib/camlp5");; Topdirs.dir_load Format.std_formatter "camlp5o.cma";; Topdirs.dir_load Format.std_formatter "${pa_j_cmo}";; #use "${hol_light_src_dir}/make.ml";; |