alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

ocaml-ng.ocamlPackages_4_00_1.ocaml: use xorg.* packages directly instead of xlibsWrapper indirection

Browse source 
Validated as no material change in `out` output with `diffoscope`.
This commit is contained in:
Sergei Trofimovich 2022-12-10 13:50:15 +00:00
parent 27ef8dda24
commit 79eaf1dbb9
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/compilers/ocaml/4.00.1.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchpatch, ncurses, xlibsWrapper }: { lib, stdenv, fetchurl, fetchpatch, ncurses, libX11 }:
let let
useX11 = !stdenv.isAarch32 && !stdenv.isMips; useX11 = !stdenv.isAarch32 && !stdenv.isMips;
@ -28,9 +28,9 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-fcommon"; NIX_CFLAGS_COMPILE = "-fcommon";
prefixKey = "-prefix "; prefixKey = "-prefix ";
configureFlags = [ "-no-tk" ] ++ optionals useX11 [ "-x11lib" xlibsWrapper ]; configureFlags = [ "-no-tk" ] ++ optionals useX11 [ "-x11lib" libX11 ];
buildFlags = [ "world" ] ++ optionals useNativeCompilers [ "bootstrap" "world.opt" ]; buildFlags = [ "world" ] ++ optionals useNativeCompilers [ "bootstrap" "world.opt" ];
buildInputs = [ ncurses ] ++ optional useX11 xlibsWrapper; buildInputs = [ ncurses ] ++ optionals useX11 [ libX11 ];
installTargets = "install" + optionalString useNativeCompilers " installopt"; installTargets = "install" + optionalString useNativeCompilers " installopt";
preConfigure = '' preConfigure = ''
CAT=$(type -tp cat) CAT=$(type -tp cat)