Skip to content

Commit

Permalink
Merge #173733: ber-metaocaml: apply glibc>=2.34 fix
Browse files Browse the repository at this point in the history
  • Loading branch information
vcunat committed May 20, 2022
2 parents f2db28c + be15e45 commit f0d6882
Showing 1 changed file with 12 additions and 0 deletions.
12 changes: 12 additions & 0 deletions pkgs/development/compilers/ocaml/ber-metaocaml.nix
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

0 comments on commit f0d6882

Please sign in to comment.