From 585b741cb72f34912b07a5234057dce47550b0eb Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 10 Dec 2018 19:59:56 +0000 Subject: [PATCH] ocaml: fix build when X11 is not available --- pkgs/development/compilers/ocaml/generic.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index 1ed6d2c6db2..d1ee43c9152 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -24,11 +24,13 @@ let name = "ocaml${optionalString flambdaSupport "+flambda"}-${version}"; in -stdenv.mkDerivation (args // rec { - +let x11env = buildEnv { name = "x11env"; paths = [libX11 xproto]; }; x11lib = x11env + "/lib"; x11inc = x11env + "/include"; +in + +stdenv.mkDerivation (args // rec { inherit name; inherit version;