public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4517 from FlorentBecker/eliom

Browse Source 
ocsigen 2014-10
This commit is contained in:
Michael Raskin
2014-11-04 12:41:59 +03:00
parent fe624050e8 10eb4786fd
commit c874dc7d9d
5 changed files with 42 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/tools/ocaml/js_of_ocaml/Makefile.conf.diff
View File

@@ -3,7 +3,7 @@
@@ -1,6 +1,6 @@
# Where binaries are installed:
-BINDIR := /usr/local/bin
-BINDIR := `dirname \`which ocamlc\``
+BINDIR := $(out)/bin
####

12
pkgs/development/tools/ocaml/js_of_ocaml/default.nix
View File

@@ -1,13 +1,15 @@
{stdenv, fetchurl, ocaml, findlib, ocaml_lwt, menhir, ocsigen_deriving}:
{stdenv, fetchurl, ocaml, findlib, ocaml_lwt, menhir, ocsigen_deriving, camlp4,
cmdliner, tyxml, reactivedata}:
stdenv.mkDerivation {
name = "js_of_ocaml";
name = "js_of_ocaml-2.5";
src = fetchurl {
url = https://github.com/ocsigen/js_of_ocaml/archive/2.2.tar.gz;
sha256 = "1cp81gpvyxgvzxg0vzyl8aa2zvcixp6m433w8zjifrg6vb7lhp97";
url = https://github.com/ocsigen/js_of_ocaml/archive/2.5.tar.gz;
sha256 = "1prm08nf8szmd3p13ysb0yx1cy6lr671bnwsp25iny8hfbs39sjv";
};
buildInputs = [ocaml findlib ocaml_lwt menhir ocsigen_deriving];
buildInputs = [ocaml findlib ocaml_lwt menhir ocsigen_deriving
cmdliner tyxml camlp4 reactivedata];
patches = [ ./Makefile.conf.diff ];