pyrox.dev / nixpkgs
lol
fork atom

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

Vladimír Čunát f0d68829 f2db28ca

+12
unified split
+12
pkgs/development/compilers/ocaml/ber-metaocaml.nix
··· 1 { lib, stdenv, fetchurl 2 , ncurses 3 , libX11, xorgproto, buildEnv 4 }: 5 6 let ··· 40 41 dontStrip = true; 42 buildInputs = [ ncurses ] ++ optionals useX11 x11deps; 43 44 postConfigure = '' 45 tar -xvzf $metaocaml
··· 1 { lib, stdenv, fetchurl 2 , ncurses 3 , libX11, xorgproto, buildEnv 4 + , fetchpatch 5 }: 6 7 let ··· 41 42 dontStrip = true; 43 buildInputs = [ ncurses ] ++ optionals useX11 x11deps; 44 + 45 + patches = [ 46 + # glibc 2.34 changed SIGSTKSZ from a #define'd integer to an 47 + # expression involving a function call. This broke all code that 48 + # used SIGSTKSZ as the size of a statically-allocated array. This 49 + # patch is also applied by the ocaml/4.07.nix expression. 50 + (fetchpatch { 51 + url = "https://github.com/ocaml/ocaml/commit/00b8c4d503732343d5d01761ad09650fe50ff3a0.patch"; 52 + sha256 = "sha256:02cfya5ff5szx0fsl5x8ax76jyrla9zmf3qxavf3adhwq5ssrfcv"; 53 + }) 54 + ]; 55 56 postConfigure = '' 57 tar -xvzf $metaocaml