From 6506d2ae4ddc7370c118f124f24d2db9932b8ce2 Mon Sep 17 00:00:00 2001
From: Guillaume Girol <symphorien+git@xlumurb.eu>
Date: Sat, 14 Aug 2021 12:00:00 +0000
Subject: [PATCH] pkgsStatic.ocaml: migrate some logic from static adapter to
 ocaml

---
 pkgs/development/compilers/ocaml/generic.nix | 4 ++--
 pkgs/top-level/static.nix                    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix
index 0f4f428c51f2..e4cec4cf52ed 100644
--- a/pkgs/development/compilers/ocaml/generic.nix
+++ b/pkgs/development/compilers/ocaml/generic.nix
@@ -3,7 +3,7 @@
 let
   versionNoPatch = "${toString major_version}.${toString minor_version}";
   version = "${versionNoPatch}.${toString patch_version}";
-  safeX11 = stdenv: !(stdenv.isAarch32 || stdenv.isMips);
+  safeX11 = stdenv: !(stdenv.isAarch32 || stdenv.isMips || stdenv.hostPlatform.isStatic);
 in
 
 { lib, stdenv, fetchurl, ncurses, buildEnv, libunwind
@@ -13,7 +13,7 @@ in
 , spaceTimeSupport ? false
 }:
 
-assert useX11 -> !stdenv.isAarch32 && !stdenv.isMips;
+assert useX11 -> safeX11 stdenv;
 assert aflSupport -> lib.versionAtLeast version "4.05";
 assert flambdaSupport -> lib.versionAtLeast version "4.03";
 assert spaceTimeSupport -> lib.versionAtLeast version "4.04";
diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix
index da66cbfbe2c3..39923b0f59a7 100644
--- a/pkgs/top-level/static.nix
+++ b/pkgs/top-level/static.nix
@@ -61,7 +61,7 @@ self: super: let
       super
     // {
       lablgtk = null; # Currently xlibs cause infinite recursion
-      ocaml = super.ocaml.override { useX11 = false; };
+      ocaml = super.ocaml;
     };
 
 in {