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

Merge pull request #12064 from FlorentBecker/eliom42

Browse Source 
Eliom42
This commit is contained in:
vbgl
2016-01-18 09:32:48 +01:00
parent 3f10b2874f f5e731168b
commit c23b0856fd
7 changed files with 31 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,14 +8,3 @@
####
--- old/Makefile 2014-09-30 16:40:37.000000000 +0200
+++ new/Makefile 2015-10-14 10:28:41.366815864 +0200
@@ -52,7 +52,7 @@
install-bin:
install -d -m 755 $(BINDIR)
install $(BIN) $(BINDIR)
- install $(TOOLS) $(BINDIR)
+ install $(TOOLS) $(BINDIR) || true
uninstall: uninstall-lib uninstall-bin

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

@@ -1,18 +1,24 @@
{stdenv, fetchurl, ocaml, findlib, ocaml_lwt, menhir, ocsigen_deriving, camlp4,
cmdliner, tyxml, reactivedata}:
cmdliner, tyxml, reactivedata, cppo, which, base64}:
stdenv.mkDerivation {
name = "js_of_ocaml-2.5";
src = fetchurl {
url = https://github.com/ocsigen/js_of_ocaml/archive/2.5.tar.gz;
sha256 = "1prm08nf8szmd3p13ysb0yx1cy6lr671bnwsp25iny8hfbs39sjv";
let camlp4_patch = fetchurl {
url = "https://github.com/FlorentBecker/js_of_ocaml/commit/3b511c5bb777d5049c49d7a04c01f142de7096b9.patch";
sha256 = "c92eda8be504cd41eb242166fc815af496243b63d4d21b169f5b62ec5ace2d39";
};
in
stdenv.mkDerivation {
name = "js_of_ocaml-2.6";
src = fetchurl {
url = https://github.com/ocsigen/js_of_ocaml/archive/2.6.tar.gz;
sha256 = "0q34lrn70dvz41m78bwgriyq6dxk97g8gcyg80nvxii4jp86dw61";
};
buildInputs = [ocaml findlib menhir ocsigen_deriving
cmdliner tyxml reactivedata];
cmdliner tyxml reactivedata cppo which base64];
propagatedBuildInputs = [ ocaml_lwt camlp4 ];
patches = [ ./Makefile.conf.diff ];
patches = [ ./Makefile.conf.diff camlp4_patch ];
createFindlibDestdir = true;