diff options
| author | Shea Levy <shea@shealevy.com> | 2014-03-19 03:56:20 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2014-03-19 03:56:20 -0400 |
| commit | e0b8a00607b4274c0cf3d5f43b8bca1b6f3e7825 (patch) | |
| tree | 2330ff79e238895a057962f38b14643b81587b18 /pkgs | |
| parent | 043bf5a94115b605745de93ec316566f852cb6b3 (diff) | |
| parent | 94a690a41ad833db38f6ef0c9cf76120e40f6e00 (diff) | |
| download | nixpkgs-e0b8a00607b4274c0cf3d5f43b8bca1b6f3e7825.tar nixpkgs-e0b8a00607b4274c0cf3d5f43b8bca1b6f3e7825.tar.gz nixpkgs-e0b8a00607b4274c0cf3d5f43b8bca1b6f3e7825.tar.bz2 nixpkgs-e0b8a00607b4274c0cf3d5f43b8bca1b6f3e7825.tar.lz nixpkgs-e0b8a00607b4274c0cf3d5f43b8bca1b6f3e7825.tar.xz nixpkgs-e0b8a00607b4274c0cf3d5f43b8bca1b6f3e7825.tar.zst nixpkgs-e0b8a00607b4274c0cf3d5f43b8bca1b6f3e7825.zip | |
Merge branch 'fix-ocaml-facile' of git://github.com/maggesi/nixpkgs
Fix compilation of ocaml-facile with OCaml 4.xx
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/facile/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/libraries/facile/ocaml_4.xx.patch | 12 |
2 files changed, 17 insertions, 3 deletions
diff --git a/pkgs/development/libraries/facile/default.nix b/pkgs/development/libraries/facile/default.nix index edbe99cd8b0..5e3776afbc0 100644 --- a/pkgs/development/libraries/facile/default.nix +++ b/pkgs/development/libraries/facile/default.nix @@ -9,9 +9,11 @@ stdenv.mkDerivation rec { }; dontAddPrefix = 1; - - patchPhase = "sed -e 's@mkdir@mkdir -p@' -i Makefile"; - + + patches = [ ./ocaml_4.xx.patch ]; + + postPatch = "sed -e 's@mkdir@mkdir -p@' -i Makefile"; + postConfigure = "make -C src .depend"; makeFlags = "FACILEDIR=\${out}/lib/ocaml/facile"; diff --git a/pkgs/development/libraries/facile/ocaml_4.xx.patch b/pkgs/development/libraries/facile/ocaml_4.xx.patch new file mode 100644 index 00000000000..429405fabda --- /dev/null +++ b/pkgs/development/libraries/facile/ocaml_4.xx.patch @@ -0,0 +1,12 @@ +diff -rupN facile-1.1/src/fcl_data.ml facile-1.1-patched//src/fcl_data.ml +--- facile-1.1/src/fcl_data.ml 2004-09-08 11:51:02.000000000 +0200 ++++ facile-1.1-patched//src/fcl_data.ml 2012-12-16 13:49:36.286722670 +0100 +@@ -16,7 +16,7 @@ end + + module Hashtbl = struct + type ('a, 'b) t = ('a, 'b) Hashtbl.t +- let create = Hashtbl.create ++ let create x = Hashtbl.create x + let get h = h + + let add h k d = |