diff options
| author | Arie Middelkoop <amiddelk@gmail.com> | 2012-07-31 00:50:48 +0200 |
|---|---|---|
| committer | Arie Middelkoop <amiddelk@gmail.com> | 2012-07-31 14:09:40 +0200 |
| commit | 63be0ae2f770dbd137e271bccd051b3adb17486b (patch) | |
| tree | c7e0556cf151e0c7b336a22aaa519814e2df69b5 /pkgs/development/ocaml-modules/sexplib | |
| parent | 5bc99bc88351222d8c03c9a8dcbf29c4f3993533 (diff) | |
| download | nixpkgs-63be0ae2f770dbd137e271bccd051b3adb17486b.tar nixpkgs-63be0ae2f770dbd137e271bccd051b3adb17486b.tar.gz nixpkgs-63be0ae2f770dbd137e271bccd051b3adb17486b.tar.bz2 nixpkgs-63be0ae2f770dbd137e271bccd051b3adb17486b.tar.lz nixpkgs-63be0ae2f770dbd137e271bccd051b3adb17486b.tar.xz nixpkgs-63be0ae2f770dbd137e271bccd051b3adb17486b.tar.zst nixpkgs-63be0ae2f770dbd137e271bccd051b3adb17486b.zip | |
patch of sexplib for compatibility with ocaml 4.00.0.
Diffstat (limited to 'pkgs/development/ocaml-modules/sexplib')
| -rw-r--r-- | pkgs/development/ocaml-modules/sexplib/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/sexplib/sexplib-7.0.5-patch-ocamlbuild-ocaml4.patch | 29 |
2 files changed, 30 insertions, 1 deletions
diff --git a/pkgs/development/ocaml-modules/sexplib/default.nix b/pkgs/development/ocaml-modules/sexplib/default.nix index d999dc471bd..32d5c842dc8 100644 --- a/pkgs/development/ocaml-modules/sexplib/default.nix +++ b/pkgs/development/ocaml-modules/sexplib/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { 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 ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/sexplib/sexplib-7.0.5-patch-ocamlbuild-ocaml4.patch b/pkgs/development/ocaml-modules/sexplib/sexplib-7.0.5-patch-ocamlbuild-ocaml4.patch new file mode 100644 index 00000000000..02e13e39445 --- /dev/null +++ b/pkgs/development/ocaml-modules/sexplib/sexplib-7.0.5-patch-ocamlbuild-ocaml4.patch @@ -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 |