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

update js_of_ocaml to 2.5

Browse Source
This commit is contained in:
Florent Becker 2014-10-14 13:04:19 +02:00
parent 249f9eee56
commit 9c441c41d7
2 changed files with 7 additions and 5 deletions
Show Stats 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 @@ @@ -1,6 +1,6 @@
# Where binaries are installed: # Where binaries are installed:
-BINDIR := /usr/local/bin -BINDIR := `dirname \`which ocamlc\``
+BINDIR := $(out)/bin +BINDIR := $(out)/bin
#### ####

10
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}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "js_of_ocaml"; name = "js_of_ocaml";
src = fetchurl { src = fetchurl {
url = https://github.com/ocsigen/js_of_ocaml/archive/2.2.tar.gz; url = https://github.com/ocsigen/js_of_ocaml/archive/2.5.tar.gz;
sha256 = "1cp81gpvyxgvzxg0vzyl8aa2zvcixp6m433w8zjifrg6vb7lhp97"; sha256 = "1prm08nf8szmd3p13ysb0yx1cy6lr671bnwsp25iny8hfbs39sjv";
}; };
buildInputs = [ocaml findlib ocaml_lwt menhir ocsigen_deriving]; buildInputs = [ocaml findlib ocaml_lwt menhir ocsigen_deriving
cmdliner camlp4];
patches = [ ./Makefile.conf.diff ]; patches = [ ./Makefile.conf.diff ];