diff options
| author | Florent Becker <florent.becker@ens-lyon.org> | 2014-10-14 13:04:19 +0200 |
|---|---|---|
| committer | Florent Becker <florent.becker@ens-lyon.org> | 2014-10-14 13:05:53 +0200 |
| commit | 9c441c41d74ac0175353805be052fc80dff15aaa (patch) | |
| tree | 5fb593f75b472491e4dc5d830944ac3704877625 /pkgs/development/tools/ocaml/js_of_ocaml | |
| parent | 249f9eee563bc993e4ad46b0b76786795c9c67a7 (diff) | |
| download | nixpkgs-9c441c41d74ac0175353805be052fc80dff15aaa.tar nixpkgs-9c441c41d74ac0175353805be052fc80dff15aaa.tar.gz nixpkgs-9c441c41d74ac0175353805be052fc80dff15aaa.tar.bz2 nixpkgs-9c441c41d74ac0175353805be052fc80dff15aaa.tar.lz nixpkgs-9c441c41d74ac0175353805be052fc80dff15aaa.tar.xz nixpkgs-9c441c41d74ac0175353805be052fc80dff15aaa.tar.zst nixpkgs-9c441c41d74ac0175353805be052fc80dff15aaa.zip | |
update js_of_ocaml to 2.5
Diffstat (limited to 'pkgs/development/tools/ocaml/js_of_ocaml')
| -rw-r--r-- | pkgs/development/tools/ocaml/js_of_ocaml/Makefile.conf.diff | 2 | ||||
| -rw-r--r-- | pkgs/development/tools/ocaml/js_of_ocaml/default.nix | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/Makefile.conf.diff b/pkgs/development/tools/ocaml/js_of_ocaml/Makefile.conf.diff index ee39855fec9..e6fc96038ff 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/Makefile.conf.diff +++ b/pkgs/development/tools/ocaml/js_of_ocaml/Makefile.conf.diff @@ -3,7 +3,7 @@ @@ -1,6 +1,6 @@ # Where binaries are installed: --BINDIR := /usr/local/bin +-BINDIR := `dirname \`which ocamlc\`` +BINDIR := $(out)/bin #### diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix index a7167d0c226..10f00c4e542 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix @@ -1,13 +1,15 @@ -{stdenv, fetchurl, ocaml, findlib, ocaml_lwt, menhir, ocsigen_deriving}: +{stdenv, fetchurl, ocaml, findlib, ocaml_lwt, menhir, ocsigen_deriving, camlp4, + cmdliner}: stdenv.mkDerivation { name = "js_of_ocaml"; 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 camlp4]; patches = [ ./Makefile.conf.diff ]; |