From d0cfb273f0ee499261746a414c653f9a82dcd73f Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 9 May 2018 06:41:45 +0000 Subject: [PATCH] ocamlPackages.ocaml_pcre: cleanup --- pkgs/development/ocaml-modules/pcre/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/ocaml-modules/pcre/default.nix b/pkgs/development/ocaml-modules/pcre/default.nix index e5533d3ad4b..fb3b67b03b7 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; {