From 79eaf1dbb9bfed9876088b3826f50645f6b0b39c Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 10 Dec 2022 13:50:15 +0000 Subject: [PATCH] ocaml-ng.ocamlPackages_4_00_1.ocaml: use xorg.* packages directly instead of xlibsWrapper indirection Validated as no material change in `out` output with `diffoscope`. --- pkgs/development/compilers/ocaml/4.00.1.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/ocaml/4.00.1.nix b/pkgs/development/compilers/ocaml/4.00.1.nix index 2033cbc32d23..c25da7346dd1 100644 --- a/pkgs/development/compilers/ocaml/4.00.1.nix +++ b/pkgs/development/compilers/ocaml/4.00.1.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, ncurses, xlibsWrapper }: +{ lib, stdenv, fetchurl, fetchpatch, ncurses, libX11 }: let useX11 = !stdenv.isAarch32 && !stdenv.isMips; @@ -28,9 +28,9 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-fcommon"; prefixKey = "-prefix "; - configureFlags = [ "-no-tk" ] ++ optionals useX11 [ "-x11lib" xlibsWrapper ]; + configureFlags = [ "-no-tk" ] ++ optionals useX11 [ "-x11lib" libX11 ]; buildFlags = [ "world" ] ++ optionals useNativeCompilers [ "bootstrap" "world.opt" ]; - buildInputs = [ ncurses ] ++ optional useX11 xlibsWrapper; + buildInputs = [ ncurses ] ++ optionals useX11 [ libX11 ]; installTargets = "install" + optionalString useNativeCompilers " installopt"; preConfigure = '' CAT=$(type -tp cat)