mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 13:41:26 +00:00
Code Issues Wiki Activity

Merge branch 'fix-ocaml-facile' of git://github.com/maggesi/nixpkgs

Browse source 
Fix compilation of ocaml-facile with OCaml 4.xx
This commit is contained in:
Shea Levy 2014-03-19 03:56:20 -04:00
parent 043bf5a941 94a690a41a
commit e0b8a00607
2 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/development/libraries/facile/default.nix
View file

@ -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";

12
pkgs/development/libraries/facile/ocaml_4.xx.patch Normal file
View file

@ -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 =