From e85ba54bb18d82b6b53096cdba599c1d6c1caf86 Mon Sep 17 00:00:00 2001 From: Antonio Nuno Monteiro Date: Wed, 25 Dec 2024 00:29:00 -0800 Subject: [PATCH] fix async_ssl on 4.14 --- ocaml/default.nix | 3 ++- ocaml/janestreet-0.16.nix | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ocaml/default.nix b/ocaml/default.nix index 940993f0..815899c5 100644 --- a/ocaml/default.nix +++ b/ocaml/default.nix @@ -102,7 +102,8 @@ let linuxHeaders nixpkgs pam - net-snmp; + net-snmp + stdenv; zstd = zstd-oc; }; janeStreet_0_17 = import ./janestreet-0.17.nix { diff --git a/ocaml/janestreet-0.16.nix b/ocaml/janestreet-0.16.nix index f493163d..a8e9ce7b 100644 --- a/ocaml/janestreet-0.16.nix +++ b/ocaml/janestreet-0.16.nix @@ -1,4 +1,5 @@ { self +, stdenv , bash , fetchpatch , fetchFromGitHub @@ -159,6 +160,9 @@ with self; meta.description = "Async wrappers for SSL"; buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ async ctypes ctypes-foreign openssl ]; + env = lib.optionalAttrs stdenv.cc.isGNU { + NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; + }; }; async_udp = janePackage {