From a5ffa79932244d21f7f7445b0ce35c2f0d37c5e8 Mon Sep 17 00:00:00 2001 From: Et7f3 Date: Tue, 24 Jan 2023 23:41:28 +0100 Subject: [PATCH 1/2] ocamlPackages.gd4o: fix build on darwin and probably on linux --- pkgs/development/ocaml-modules/gd4o/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/ocaml-modules/gd4o/default.nix b/pkgs/development/ocaml-modules/gd4o/default.nix index 19a1b42f06bd..9923edc2e8db 100644 --- a/pkgs/development/ocaml-modules/gd4o/default.nix +++ b/pkgs/development/ocaml-modules/gd4o/default.nix @@ -12,6 +12,9 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib libjpeg libpng ]; propagatedBuildInputs = [ gd zlib freetype ]; + prePatch = '' + substituteInPlace Makefile --replace gcc cc + ''; preInstall = '' mkdir -p $OCAMLFIND_DESTDIR/stublibs From fd1a6a66722dd76cbe5576221aed0a9de1563931 Mon Sep 17 00:00:00 2001 From: Et7f3 Date: Wed, 25 Jan 2023 14:17:15 +0100 Subject: [PATCH 2/2] ocamlPackages.gd4o: Support cross-compilation Co-authored-by: Weijia Wang <9713184+wegank@users.noreply.github.com> --- pkgs/development/ocaml-modules/gd4o/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/gd4o/default.nix b/pkgs/development/ocaml-modules/gd4o/default.nix index 9923edc2e8db..cd2069648566 100644 --- a/pkgs/development/ocaml-modules/gd4o/default.nix +++ b/pkgs/development/ocaml-modules/gd4o/default.nix @@ -12,9 +12,9 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib libjpeg libpng ]; propagatedBuildInputs = [ gd zlib freetype ]; - prePatch = '' - substituteInPlace Makefile --replace gcc cc - ''; + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + ]; preInstall = '' mkdir -p $OCAMLFIND_DESTDIR/stublibs