Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ber-metaocaml: apply glibc>=2.34 fix from ocaml/4.07.nix #173733

Merged
merged 1 commit into from May 20, 2022
+12 −0
Merged

ber-metaocaml: apply glibc>=2.34 fix from ocaml/4.07.nix #173733

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions pkgs/development/compilers/ocaml/ber-metaocaml.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ lib, stdenv, fetchurl
, ncurses
, libX11, xorgproto, buildEnv
, fetchpatch
}:

let
Expand Down Expand Up @@ -41,6 +42,17 @@ stdenv.mkDerivation rec {
dontStrip = true;
buildInputs = [ ncurses ] ++ optionals useX11 x11deps;

patches = [
# glibc 2.34 changed SIGSTKSZ from a #define'd integer to an
# expression involving a function call. This broke all code that
# used SIGSTKSZ as the size of a statically-allocated array. This
# patch is also applied by the ocaml/4.07.nix expression.
(fetchpatch {
url = "https://github.com/ocaml/ocaml/commit/00b8c4d503732343d5d01761ad09650fe50ff3a0.patch";
sha256 = "sha256:02cfya5ff5szx0fsl5x8ax76jyrla9zmf3qxavf3adhwq5ssrfcv";
})
];

postConfigure = ''
tar -xvzf $metaocaml
cd ${pname}-${version}
Expand Down