diff options
| author | Arie Middelkoop <amiddelk@gmail.com> | 2012-02-29 12:51:06 +0000 |
|---|---|---|
| committer | Arie Middelkoop <amiddelk@gmail.com> | 2012-02-29 12:51:06 +0000 |
| commit | d9f5e277a5471f1c03d14dced75738b62d323b56 (patch) | |
| tree | c5bbc67d4025b65999f61d6c8bfc1377f5baf84e /pkgs/development | |
| parent | d4960f72bec068336819f3258fa67f1b1b4a6bd7 (diff) | |
| download | nixpkgs-d9f5e277a5471f1c03d14dced75738b62d323b56.tar nixpkgs-d9f5e277a5471f1c03d14dced75738b62d323b56.tar.gz nixpkgs-d9f5e277a5471f1c03d14dced75738b62d323b56.tar.bz2 nixpkgs-d9f5e277a5471f1c03d14dced75738b62d323b56.tar.lz nixpkgs-d9f5e277a5471f1c03d14dced75738b62d323b56.tar.xz nixpkgs-d9f5e277a5471f1c03d14dced75738b62d323b56.tar.zst nixpkgs-d9f5e277a5471f1c03d14dced75738b62d323b56.zip | |
OCamlMakefile update.
svn path=/nixpkgs/trunk/; revision=32687
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/ocaml-modules/ocamlmake/default.nix | 20 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/ocamlmake/setup-hook.sh | 5 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/pycaml/default.nix | 4 |
3 files changed, 21 insertions, 8 deletions
diff --git a/pkgs/development/ocaml-modules/ocamlmake/default.nix b/pkgs/development/ocaml-modules/ocamlmake/default.nix index 69386bd7578..23858576efd 100644 --- a/pkgs/development/ocaml-modules/ocamlmake/default.nix +++ b/pkgs/development/ocaml-modules/ocamlmake/default.nix @@ -1,16 +1,24 @@ {stdenv, fetchurl}: -stdenv.mkDerivation { - name = "ocaml-make-6.33.0"; +let + + version = "6.36.0"; + sha256 = "7c9a771d79bf945050dc7530957f4b61669976177818185e64c002cbfd75e3a2"; + +in stdenv.mkDerivation { + name = "ocaml-make-${version}"; src = fetchurl { - url = "http://www.ocaml.info/ocaml_sources/ocaml-make-6.33.0.tar.gz"; - sha256 = "3054303ba04e4bbbe038e08310fabc3e5a0e3899bbba33d9ac5ed7a1b9d1e05a"; + url = "http://hg.ocaml.info/release/ocaml-make/archive/release-${version}.tar.bz2"; + inherit sha256; }; - phases = [ "unpackPhase" "installPhase" ]; + installPhase = '' + ensureDir "$out/include/" + cp OCamlMakefile "$out/include/" + ''; - installPhase = "cp OCamlMakefile $out"; + setupHook = ./setup-hook.sh; meta = { homepage = "http://www.ocaml.info/home/ocaml_sources.html"; diff --git a/pkgs/development/ocaml-modules/ocamlmake/setup-hook.sh b/pkgs/development/ocaml-modules/ocamlmake/setup-hook.sh new file mode 100644 index 00000000000..876556a7b92 --- /dev/null +++ b/pkgs/development/ocaml-modules/ocamlmake/setup-hook.sh @@ -0,0 +1,5 @@ +addOcamlMakefile () { + export OCAMLMAKEFILE="@out@/include/OCamlMakefile" +} + +envHooks=(${envHooks[@]} addOcamlMakefile) diff --git a/pkgs/development/ocaml-modules/pycaml/default.nix b/pkgs/development/ocaml-modules/pycaml/default.nix index af7207064ba..b6c0df5ac15 100644 --- a/pkgs/development/ocaml-modules/pycaml/default.nix +++ b/pkgs/development/ocaml-modules/pycaml/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { sha256 = "ff6d863c42b4ef798f50ff5eff77b47b77b5c0d28b6f65364e8a436a216dc591"; }; - buildInputs = [ocaml findlib python]; + buildInputs = [ocaml findlib python ocaml_make]; createFindlibDestdir = true; @@ -26,7 +26,7 @@ stdenv.mkDerivation { # fix some paths to the appropriate store paths. patchPhase = '' - sed -i "Makefile" -e's|/usr/include/OCamlMakefile|${ocaml_make}|g' + sed -i "Makefile" -e's|/usr/include/OCamlMakefile|${ocaml_make}/include/OCamlMakefile|g' sed -i "Makefile" -e's|/usr|${python}|g' ''; |