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`.
This commit is contained in:
parent
27ef8dda24
commit
79eaf1dbb9
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue