ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 21:33:03 +03:00
Code Issues Projects Releases Wiki Activity

patch of sexplib for compatibility with ocaml 4.00.0.

Browse Source
This commit is contained in:
Arie Middelkoop 2012-07-31 00:50:48 +02:00
parent 5bc99bc883
commit 63be0ae2f7
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/ocaml-modules/sexplib/default.nix
View File

@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "b1022da052254581aae51fb634345920364439f715a2c786abcd0b828c2ce697"; sha256 = "b1022da052254581aae51fb634345920364439f715a2c786abcd0b828c2ce697";
}; };
patches = [ ./sexp-3.10-compat.patch ]; patches = [ ./sexp-3.10-compat.patch ./sexplib-7.0.5-patch-ocamlbuild-ocaml4.patch ];
buildInputs = [ocaml findlib ocaml_typeconv ]; buildInputs = [ocaml findlib ocaml_typeconv ];
createFindlibDestdir = true; createFindlibDestdir = true;

29
pkgs/development/ocaml-modules/sexplib/sexplib-7.0.5-patch-ocamlbuild-ocaml4.patch Normal file
View File

@ -0,0 +1,29 @@
Patch from the fedora repository.
--- sexplib-7.0.5.old/myocamlbuild.ml 2012-03-20 16:41:54.000000000 +0000
+++ sexplib-7.0.5/myocamlbuild.ml 2012-07-30 11:38:21.829869635 +0100
@@ -438,7 +438,13 @@
BaseEnvLight.var_choose cond_specs env
in
flag tags & spec)
- t.flags
+ t.flags;
+
+ flag ["ocaml"; "compile"; "byte"; "use_toploop"] (S[A"-I"; A"+compiler-libs"]);
+ flag ["ocaml"; "link"; "byte"; "use_toploop"] (S[A"-I"; A"+compiler-libs"; A"+compiler-libs/ocamltoplevel.cma"]);
+ flag ["ocaml"; "compile"; "native"; "use_toploop"] (S[A"-I"; A"+compiler-libs"]);
+ flag ["ocaml"; "link"; "native"; "use_toploop"] (S[A"-I"; A"+compiler-libs"; A"+compiler-libs/ocamltoplevel.cmxa"]);
+
| _ ->
()
--- sexplib-7.0.5.old/_tags 2012-03-20 16:41:54.000000000 +0000
+++ sexplib-7.0.5/_tags 2012-07-30 11:37:01.749255839 +0100
@@ -49,6 +49,7 @@
<lib_test/*.ml{,i}>: pkg_camlp4.extend
# Library sexplib_top
"top": include
+<top/*.ml{,i}>: use_toploop
# Executable sexp_test
"lib_test/sexp_test.byte": use_sexplib
"lib_test/sexp_test.byte": pkg_unix