diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2018-05-09 06:41:45 +0000 |
|---|---|---|
| committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2018-05-09 16:12:36 +0000 |
| commit | d0cfb273f0ee499261746a414c653f9a82dcd73f (patch) | |
| tree | cf252cf765037e836a6ec97719707a369ea2905b | |
| parent | d9debbeacf7ddf35380a5d59f2742a14579d0fc5 (diff) | |
| download | nixlib-d0cfb273f0ee499261746a414c653f9a82dcd73f.tar nixlib-d0cfb273f0ee499261746a414c653f9a82dcd73f.tar.gz nixlib-d0cfb273f0ee499261746a414c653f9a82dcd73f.tar.bz2 nixlib-d0cfb273f0ee499261746a414c653f9a82dcd73f.tar.lz nixlib-d0cfb273f0ee499261746a414c653f9a82dcd73f.tar.xz nixlib-d0cfb273f0ee499261746a414c653f9a82dcd73f.tar.zst nixlib-d0cfb273f0ee499261746a414c653f9a82dcd73f.zip | |
ocamlPackages.ocaml_pcre: cleanup
| -rw-r--r-- | pkgs/development/ocaml-modules/pcre/default.nix | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/pkgs/development/ocaml-modules/pcre/default.nix b/pkgs/development/ocaml-modules/pcre/default.nix index e5533d3ad4be..fb3b67b03b78 100644 --- a/pkgs/development/ocaml-modules/pcre/default.nix +++ b/pkgs/development/ocaml-modules/pcre/default.nix @@ -1,21 +1,19 @@ -{stdenv, buildOcaml, fetchurl, pcre, ocaml, findlib}: +{ stdenv, fetchurl, pcre, ocaml, findlib, ocamlbuild }: -buildOcaml { - name = "pcre"; +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-pcre-${version}"; version = "7.2.3"; src = fetchurl { - url = "https://github.com/mmottl/pcre-ocaml/releases/download/v7.2.3/pcre-ocaml-7.2.3.tar.gz"; + url = "https://github.com/mmottl/pcre-ocaml/releases/download/v${version}/pcre-ocaml-${version}.tar.gz"; sha256 = "0rj6dw79px4sj2kq0iss2nzq3rnsn9wivvc0f44wa1mppr6njfb3"; }; - buildInputs = [ocaml findlib]; + buildInputs = [ ocaml findlib ocamlbuild ]; propagatedBuildInputs = [pcre]; createFindlibDestdir = true; - hasSharedObjects = true; - configurePhase = "true"; # Skip configure phase meta = with stdenv.lib; { |