@ -1,4 +1,4 @@
{ lib , stdenv , fetchurl , runCommand , bootstrap_cmds , coreutils , glibc , m4 , runtimeShell }:
{ lib , stdenv , fetchurl , fetchpatch , runCommand , bootstrap_cmds , coreutils , glibc , m4 , runtimeShell }:
let
let
options = rec {
options = rec {
@ -59,6 +59,21 @@ stdenv.mkDerivation rec {
sha256 = cfg . sha256 ;
sha256 = cfg . sha256 ;
} ;
} ;
patches = [
# Pull upstream fiux for -fno-common toolchains:
# https://github.com/Clozure/ccl/pull/316
( fetchpatch {
name = " f n o - c o m m o n - p 1 . p a t c h " ;
url = " h t t p s : / / g i t h u b . c o m / C l o z u r e / c c l / c o m m i t / 1 8 5 d c 1 a 0 0 e 7 4 9 2 f 8 b e 9 8 e 5 f 9 3 b 5 6 1 7 5 8 4 2 3 5 9 5 f 1 . p a t c h " ;
sha256 = " 0 w q f d s 7 3 4 6 q d w d s x z 3 b l 2 p 6 0 1 i b 9 4 r d p 9 n k n j 7 i g j 0 1 q 8 l q f p a j w " ;
} )
( fetchpatch {
name = " f n o - c o m m o n - p 2 . p a t c h " ;
url = " h t t p s : / / g i t h u b . c o m / C l o z u r e / c c l / c o m m i t / 9 9 7 d e 9 1 0 6 2 d 1 f 1 5 2 d 0 c 3 b 3 2 2 a 1 e 3 6 9 4 2 4 3 e 4 a 4 0 3 . p a t c h " ;
sha256 = " 1 0 w 6 z w 8 w g a l k d y y a 4 m 4 8 l g c a 4 p 9 w g c p 1 h 4 4 h y 9 w q r 9 4 d z l l l q 0 f 6 " ;
} )
] ;
buildInputs = if stdenv . isDarwin then [ bootstrap_cmds m4 ] else [ glibc m4 ] ;
buildInputs = if stdenv . isDarwin then [ bootstrap_cmds m4 ] else [ glibc m4 ] ;
CCL_RUNTIME = cfg . runtime ;
CCL_RUNTIME = cfg . runtime ;