diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2022-12-11 14:22:18 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-11 14:22:18 +0000 |
| commit | bee0009e1e704fdeaf56ee9f1999e2e56b29c831 (patch) | |
| tree | 575f1a835cc7c6a2c78c5441357960ae0a9d7b06 | |
| parent | Merge pull request #205549 from r-ryantm/auto-update/primesieve (diff) | |
| parent | ocaml-ng.ocamlPackages_4_00_1.ocaml: use xorg.* packages directly instead of ... (diff) | |
| download | nixpkgs-bee0009e1e704fdeaf56ee9f1999e2e56b29c831.tar.gz | |
Merge pull request #205480 from trofi/ocaml-4_00_1-without-xlibsWrapper
ocaml-ng.ocamlPackages_4_00_1.ocaml: use xorg.* packages directly ins…
| -rw-r--r-- | pkgs/development/compilers/ocaml/4.00.1.nix | 6 |
1 files 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) |