From 79bc38c1bce8544a23ee27701f7efd589387543f Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 21 Feb 2019 14:43:19 +0000 Subject: [PATCH] =?UTF-8?q?ocamlPackages.mlgmpidl:=201.2.7=20->=C2=A01.2.8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This version builds even if profiling is not available (e.g., on Aarch). --- .../ocaml-modules/mlgmpidl/default.nix | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/pkgs/development/ocaml-modules/mlgmpidl/default.nix b/pkgs/development/ocaml-modules/mlgmpidl/default.nix index 9c9912cfb8c..1a46c1e939b 100644 --- a/pkgs/development/ocaml-modules/mlgmpidl/default.nix +++ b/pkgs/development/ocaml-modules/mlgmpidl/default.nix @@ -2,25 +2,23 @@ stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-mlgmpidl-${version}"; - version = "1.2.7"; + version = "1.2.8"; src = fetchFromGitHub { owner = "nberth"; repo = "mlgmpidl"; rev = version; - sha256 = "063hy1divbiabqm5x307iamw942sivzw9fr8vczy3kgndfp12nic"; + sha256 = "1csqplyxi5gq6ma7g4la2x20mhz1plmjallsankv0mn0x69zb1id"; }; buildInputs = [ perl gmp mpfr ocaml findlib camlidl ]; - configurePhase = '' - echo CAML_PREFIX = ${ocaml} > Makefile.config - cat Makefile.config.model >> Makefile.config - sed -i Makefile.config \ - -e 's|^MLGMPIDL_PREFIX.*$|MLGMPIDL_PREFIX = $out|' \ - -e 's|^GMP_PREFIX.*$|GMP_PREFIX = ${gmp.dev}|' \ - -e 's|^MPFR_PREFIX.*$|MPFR_PREFIX = ${mpfr.dev}|' \ - -e 's|^CAMLIDL_DIR.*$|CAMLIDL_DIR = ${camlidl}/lib/ocaml/${ocaml.version}/site-lib/camlidl|' - echo HAS_NATIVE_PLUGINS = 1 >> Makefile.config + prefixKey = "-prefix "; + configureFlags = [ + "--gmp-prefix ${gmp.dev}" + "--mpfr-prefix ${mpfr.dev}" + ]; + + postConfigure = '' sed -i Makefile \ -e 's|^ /bin/rm | rm |' '';