diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-12-11 18:01:53 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-11 18:01:53 +0000 |
| commit | f14765eb08276d3a3a0974a67b1b84283a38ebb6 (patch) | |
| tree | 3528e5968af228bd3b76d79f31ef9954a02c7adc /pkgs/development/compilers/ocaml | |
| parent | 5dca623c6c3fe5177ffb42e2b751efc584ce6714 (diff) | |
| parent | 99d681c4e77909a41df6f5166d9d9330e24d31cf (diff) | |
| download | nixpkgs-f14765eb08276d3a3a0974a67b1b84283a38ebb6.tar nixpkgs-f14765eb08276d3a3a0974a67b1b84283a38ebb6.tar.gz nixpkgs-f14765eb08276d3a3a0974a67b1b84283a38ebb6.tar.bz2 nixpkgs-f14765eb08276d3a3a0974a67b1b84283a38ebb6.tar.lz nixpkgs-f14765eb08276d3a3a0974a67b1b84283a38ebb6.tar.xz nixpkgs-f14765eb08276d3a3a0974a67b1b84283a38ebb6.tar.zst nixpkgs-f14765eb08276d3a3a0974a67b1b84283a38ebb6.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/compilers/ocaml')
| -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 2033cbc32d2..c25da7346dd 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) |