diff options
| author | Profpatsch <mail@profpatsch.de> | 2016-11-04 12:24:57 +0100 |
|---|---|---|
| committer | Profpatsch <mail@profpatsch.de> | 2016-11-04 12:24:57 +0100 |
| commit | 2bd86e9e47d82acf296b353e2bd6b5cb6b7ba213 (patch) | |
| tree | 947e0194e8689d45eb9d83aaa27c3471bcbfd350 /pkgs/development/ocaml-modules/uutf | |
| parent | c5cac5051af83b41c3601e7e7116f7b49c8dd010 (diff) | |
| download | nixlib-2bd86e9e47d82acf296b353e2bd6b5cb6b7ba213.tar nixlib-2bd86e9e47d82acf296b353e2bd6b5cb6b7ba213.tar.gz nixlib-2bd86e9e47d82acf296b353e2bd6b5cb6b7ba213.tar.bz2 nixlib-2bd86e9e47d82acf296b353e2bd6b5cb6b7ba213.tar.lz nixlib-2bd86e9e47d82acf296b353e2bd6b5cb6b7ba213.tar.xz nixlib-2bd86e9e47d82acf296b353e2bd6b5cb6b7ba213.tar.zst nixlib-2bd86e9e47d82acf296b353e2bd6b5cb6b7ba213.zip | |
Revert "Merge pull request #20090 from sternenseemann/master"
Reason: https://github.com/NixOS/nixpkgs/pull/20090#commitcomment-19686426 This reverts commit 9ffcb1b2503303bfdb4a8fc31c8e4160184eb74c, reversing changes made to a6283c1126676d30de3abfb3ee8865505da0ed43.
Diffstat (limited to 'pkgs/development/ocaml-modules/uutf')
| -rw-r--r-- | pkgs/development/ocaml-modules/uutf/default.nix | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/pkgs/development/ocaml-modules/uutf/default.nix b/pkgs/development/ocaml-modules/uutf/default.nix index bdddf7d16b61..fda630114ed6 100644 --- a/pkgs/development/ocaml-modules/uutf/default.nix +++ b/pkgs/development/ocaml-modules/uutf/default.nix @@ -1,38 +1,32 @@ -{ stdenv, buildOcaml, fetchurl, ocaml, findlib, ocamlbuild, opam, cmdliner}: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam }: let pname = "uutf"; webpage = "http://erratique.ch/software/${pname}"; in -buildOcaml rec { - name = pname; - version = "0.9.4"; +assert stdenv.lib.versionAtLeast ocaml.version "3.12"; - minimumSupportedOcamlVersion = "3.12"; +stdenv.mkDerivation rec { + name = "ocaml-${pname}-${version}"; + version = "0.9.3"; src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "1f71fyawxal42x6g82539bv0ava2smlar6rmxxz1cyq3l0i6fw0k"; + sha256 = "0xvq20knmq25902ijpbk91ax92bkymsqkbfklj1537hpn64lydhz"; }; buildInputs = [ ocaml findlib ocamlbuild opam ]; - propagatedBuildInputs = [ cmdliner ]; createFindlibDestdir = true; unpackCmd = "tar xjf $src"; - buildPhase = '' - ocaml pkg/git.ml - ocaml pkg/build.ml \ - native=true \ - native-dynlink=true \ - cmdliner=true - ''; + buildPhase = "./pkg/build true"; installPhase = '' - opam-installer --prefix=$out --script | sh - ln -s $out/lib/uutf $out/lib/ocaml/${ocaml.version}/site-lib/ + opam-installer --script --prefix=$out ${pname}.install > install.sh + sh install.sh + ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml.version}/site-lib/ ''; meta = with stdenv.lib; { |