gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #205480 from trofi/ocaml-4_00_1-without-xlibsWrapper

Browse Source 
ocaml-ng.ocamlPackages_4_00_1.ocaml: use xorg.* packages directly ins…
This commit is contained in:
Sergei Trofimovich
2022-12-11 14:22:18 +00:00
committed by GitHub
parent acab62a06d 79eaf1dbb9
commit bee0009e1e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/ocaml/4.00.1.nix
+3 -3
View File
@@ -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)