diff options
| author | sternenseemann <git@lukasepple.de> | 2016-11-03 03:02:16 +0100 |
|---|---|---|
| committer | sternenseemann <git@lukasepple.de> | 2016-11-03 14:34:35 +0100 |
| commit | 21a191df74e9b9ca8c32050d343177635a6b8ccd (patch) | |
| tree | 835195de996bb748fff6a8391e048e4dd1cdfb09 /pkgs/development/ocaml-modules/uutf | |
| parent | db760a5edc5b3ffbf76250e0549ffc27ad23d54d (diff) | |
ocaml-uutf: 0.9.3 -> 0.9.4
This commit also refactors the expression
Diffstat (limited to 'pkgs/development/ocaml-modules/uutf')
| -rw-r--r-- | pkgs/development/ocaml-modules/uutf/default.nix | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/pkgs/development/ocaml-modules/uutf/default.nix b/pkgs/development/ocaml-modules/uutf/default.nix index fda630114ed6a..bdddf7d16b619 100644 --- a/pkgs/development/ocaml-modules/uutf/default.nix +++ b/pkgs/development/ocaml-modules/uutf/default.nix @@ -1,32 +1,38 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam }: +{ stdenv, buildOcaml, fetchurl, ocaml, findlib, ocamlbuild, opam, cmdliner}: let pname = "uutf"; webpage = "http://erratique.ch/software/${pname}"; in -assert stdenv.lib.versionAtLeast ocaml.version "3.12"; +buildOcaml rec { + name = pname; + version = "0.9.4"; -stdenv.mkDerivation rec { - name = "ocaml-${pname}-${version}"; - version = "0.9.3"; + minimumSupportedOcamlVersion = "3.12"; src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "0xvq20knmq25902ijpbk91ax92bkymsqkbfklj1537hpn64lydhz"; + sha256 = "1f71fyawxal42x6g82539bv0ava2smlar6rmxxz1cyq3l0i6fw0k"; }; buildInputs = [ ocaml findlib ocamlbuild opam ]; + propagatedBuildInputs = [ cmdliner ]; createFindlibDestdir = true; unpackCmd = "tar xjf $src"; - buildPhase = "./pkg/build true"; + buildPhase = '' + ocaml pkg/git.ml + ocaml pkg/build.ml \ + native=true \ + native-dynlink=true \ + cmdliner=true + ''; installPhase = '' - opam-installer --script --prefix=$out ${pname}.install > install.sh - sh install.sh - ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml.version}/site-lib/ + opam-installer --prefix=$out --script | sh + ln -s $out/lib/uutf $out/lib/ocaml/${ocaml.version}/site-lib/ ''; meta = with stdenv.lib; { |