From fe6b447c430b23f508af608aff740e0c644297d7 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 1 Mar 2023 04:04:20 +0000 Subject: [PATCH 1/2] ocamlPackages.elina: fixup build by using older make --- pkgs/development/ocaml-modules/elina/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/elina/default.nix b/pkgs/development/ocaml-modules/elina/default.nix index ec4199cc06eb..c0a4cbc31e30 100644 --- a/pkgs/development/ocaml-modules/elina/default.nix +++ b/pkgs/development/ocaml-modules/elina/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, perl, gmp, mpfr, ocaml, findlib, camlidl, apron }: +{ stdenv, lib, fetchurl, gnumake42, perl, gmp, mpfr, ocaml, findlib, camlidl, apron }: stdenv.mkDerivation rec { version = "1.1"; @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1nymykskq1yx87y4xl6hl9i4q6kv0qaq25rniqgl1bfn883p1ysc"; }; - nativeBuildInputs = [ perl ocaml findlib camlidl ]; + # fails with make 4.4 + nativeBuildInputs = [ gnumake42 perl ocaml findlib camlidl ]; propagatedBuildInputs = [ apron gmp mpfr ]; From d23e7b1be4e9c3a3135ca07045fb809278b5bf9d Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 2 Mar 2023 09:41:09 +0000 Subject: [PATCH 2/2] ocamlPackages.elina: more precise meta.platforms --- pkgs/development/ocaml-modules/elina/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/elina/default.nix b/pkgs/development/ocaml-modules/elina/default.nix index c0a4cbc31e30..de000f8aaf83 100644 --- a/pkgs/development/ocaml-modules/elina/default.nix +++ b/pkgs/development/ocaml-modules/elina/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { homepage = "http://elina.ethz.ch/"; license = lib.licenses.lgpl3; maintainers = [ lib.maintainers.vbgl ]; - inherit (ocaml.meta) platforms; + platforms = lib.intersectLists ocaml.meta.platforms lib.platforms.x86; }; }