From cfeb42b8eb61bb016741bc06885662c35af287d3 Mon Sep 17 00:00:00 2001 From: Florent Becker Date: Wed, 15 Oct 2014 11:14:34 +0200 Subject: [PATCH] Adapt the derivation for the update of eliom to 4.1 --- pkgs/development/ocaml-modules/eliom/default.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index 5fe86a92d0d..2e23a5fa86d 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, ocaml, findlib, which, ocsigen_server, ocsigen_deriving, js_of_ocaml, ocaml_react, ocaml_lwt, calendar, cryptokit, tyxml, - ocaml_ipaddr, ocamlnet, ocaml_ssl, ocaml_pcre, ocaml_optcomp}: + ocaml_ipaddr, ocamlnet, ocaml_ssl, ocaml_pcre, ocaml_optcomp, + reactivedata}: stdenv.mkDerivation { @@ -14,12 +15,7 @@ stdenv.mkDerivation buildInputs = [ocaml which ocsigen_server findlib ocsigen_deriving js_of_ocaml ocaml_react ocaml_lwt calendar cryptokit tyxml ocaml_ipaddr ocamlnet ocaml_ssl - ocaml_pcre ocaml_optcomp]; - - preConfigure = - ''chmod a+x configure - sed s/deriving-ocsigen/deriving/g -i configure - ''; + ocaml_pcre ocaml_optcomp reactivedata]; configureFlags = "--root $(out) --prefix /";