lol

polyml*: fix build w/glibc-2.34

Failing Hydra build: https://hydra.nixos.org/build/156205993

+27 -3
+9 -1
pkgs/development/compilers/polyml/5.6.nix
··· 1 - {lib, stdenv, fetchurl, autoreconfHook}: 1 + {lib, stdenv, fetchurl, autoreconfHook, fetchpatch }: 2 2 3 3 let 4 4 version = "5.6"; ··· 11 11 prePatch = lib.optionalString stdenv.isDarwin '' 12 12 substituteInPlace configure.ac --replace stdc++ c++ 13 13 ''; 14 + 15 + patches = [ 16 + # glibc 2.34 compat 17 + (fetchpatch { 18 + url = "https://src.fedoraproject.org/rpms/polyml/raw/4d8868ca5a1ce3268f212599a321f8011c950496/f/polyml-pthread-stack-min.patch"; 19 + sha256 = "1h5ihg2sxld9ymrl3f2mpnbn2242ka1fsa0h4gl9h90kndvg6kby"; 20 + }) 21 + ]; 14 22 15 23 buildInputs = lib.optional stdenv.isDarwin autoreconfHook; 16 24
+10 -2
pkgs/development/compilers/polyml/5.7.nix
··· 1 - { lib, stdenv, fetchFromGitHub, autoreconfHook, gmp, libffi }: 1 + { lib, stdenv, fetchFromGitHub, autoreconfHook, gmp, libffi, fetchpatch }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "polyml"; ··· 8 8 substituteInPlace configure.ac --replace stdc++ c++ 9 9 ''; 10 10 11 - patches = [ ./5.7-new-libffi-FFI_SYSV.patch ]; 11 + patches = [ 12 + ./5.7-new-libffi-FFI_SYSV.patch 13 + 14 + # glibc 2.34 compat 15 + (fetchpatch { 16 + url = "https://src.fedoraproject.org/rpms/polyml/raw/4d8868ca5a1ce3268f212599a321f8011c950496/f/polyml-pthread-stack-min.patch"; 17 + sha256 = "1h5ihg2sxld9ymrl3f2mpnbn2242ka1fsa0h4gl9h90kndvg6kby"; 18 + }) 19 + ]; 12 20 13 21 buildInputs = [ libffi gmp ]; 14 22
+8
pkgs/development/compilers/polyml/default.nix
··· 12 12 13 13 nativeBuildInputs = lib.optional stdenv.isDarwin autoreconfHook; 14 14 15 + patches = [ 16 + # glibc 2.34 compat 17 + (fetchpatch { 18 + url = "https://src.fedoraproject.org/rpms/polyml/raw/4d8868ca5a1ce3268f212599a321f8011c950496/f/polyml-pthread-stack-min.patch"; 19 + sha256 = "1h5ihg2sxld9ymrl3f2mpnbn2242ka1fsa0h4gl9h90kndvg6kby"; 20 + }) 21 + ]; 22 + 15 23 configureFlags = [ 16 24 "--enable-shared" 17 25 "--with-system-libffi"