public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Handle variable createFindlibDestdir correctly in ocaml-findlib

Browse Source 
* Fix HOL Light derivation

svn path=/nixpkgs/trunk/; revision=25269
This commit is contained in:
Marco Maggesi 2010-12-23 19:28:06 +00:00
parent 8e81fd9ee8
commit 51d6c8df91
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/science/logic/hol_light/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, writeText, writeTextFile, ocaml, camlp5_transitional, hol_light_sources}: {stdenv, writeText, writeTextFile, ocaml, findlib, camlp5_transitional, hol_light_sources}:
let let
version = hol_light_sources.version; version = hol_light_sources.version;
@ -10,11 +10,11 @@ let
pa_j_cmo = stdenv.mkDerivation { pa_j_cmo = stdenv.mkDerivation {
name = "pa_j.cmo"; name = "pa_j.cmo";
inherit ocaml camlp5; inherit ocaml camlp5;
buildInputs = [ ocaml camlp5 ]; buildInputs = [ ocaml camlp5 findlib ];
buildCommand = '' buildCommand = ''
ocamlc -c \ ocamlc -c \
-pp "camlp5r pa_lexer.cmo pa_extend.cmo q_MLast.cmo" \ -pp "camlp5r pa_lexer.cmo pa_extend.cmo q_MLast.cmo" \
-I "${camlp5}/lib/ocaml/camlp5" \ -I "$(ocamlfind query camlp5)" \
-o $out \ -o $out \
"${hol_light_src_dir}/pa_j_`ocamlc -version | cut -c1-4`.ml" "${hol_light_src_dir}/pa_j_`ocamlc -version | cut -c1-4`.ml"
''; '';
@ -22,7 +22,7 @@ let
start_ml = writeText "start.ml" '' start_ml = writeText "start.ml" ''
Topdirs.dir_directory "${hol_light_src_dir}";; 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 "camlp5o.cma";;
Topdirs.dir_load Format.std_formatter "${pa_j_cmo}";; Topdirs.dir_load Format.std_formatter "${pa_j_cmo}";;
#use "${hol_light_src_dir}/make.ml";; #use "${hol_light_src_dir}/make.ml";;

2
pkgs/development/tools/ocaml/findlib/default.nix
View File

@ -40,7 +40,7 @@ stdenv.mkDerivation {
export OCAMLPATH="''${OCAMLPATH}''${OCAMLPATH:+:}''$1/lib/ocaml/${ocaml_version}/site-lib/" export OCAMLPATH="''${OCAMLPATH}''${OCAMLPATH:+:}''$1/lib/ocaml/${ocaml_version}/site-lib/"
fi fi
export OCAMLFIND_DESTDIR="''$out/lib/ocaml/${ocaml_version}/site-lib/" export OCAMLFIND_DESTDIR="''$out/lib/ocaml/${ocaml_version}/site-lib/"
if test -n $createFindlibDestdir; then if test -n "$createFindlibDestdir"; then
ensureDir $OCAMLFIND_DESTDIR ensureDir $OCAMLFIND_DESTDIR
fi fi
} }

2
pkgs/top-level/all-packages.nix
View File

@ -7035,7 +7035,7 @@ let
hol = callPackage ../applications/science/logic/hol { }; hol = callPackage ../applications/science/logic/hol { };
hol_light = callPackage ../applications/science/logic/hol_light { hol_light = callPackage ../applications/science/logic/hol_light {
inherit (ocamlPackages) camlp5_transitional; inherit (ocamlPackages) findlib camlp5_transitional;
}; };
hol_light_sources = callPackage ../applications/science/logic/hol_light/sources.nix { }; hol_light_sources = callPackage ../applications/science/logic/hol_light/sources.nix { };