cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge #173733: ber-metaocaml: apply glibc>=2.34 fix

Browse source
This commit is contained in:
Vladimír Čunát 2022-05-20 17:07:30 +02:00
commit f0d68829b2
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/development/compilers/ocaml/ber-metaocaml.nix
View file

@ -1,6 +1,7 @@
{ lib, stdenv, fetchurl { lib, stdenv, fetchurl
, ncurses , ncurses
, libX11, xorgproto, buildEnv , libX11, xorgproto, buildEnv
, fetchpatch
}: }:
let let
@ -41,6 +42,17 @@ stdenv.mkDerivation rec {
dontStrip = true; dontStrip = true;
buildInputs = [ ncurses ] ++ optionals useX11 x11deps; 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 = '' postConfigure = ''
tar -xvzf $metaocaml tar -xvzf $metaocaml
cd ${pname}-${version} cd ${pname}-${version}