tjh.dev
bison2: Fix Darwin runtime crash
+3
-1
pkgs/development/tools/parsing/bison/2.x.nix
+3
-1
pkgs/development/tools/parsing/bison/2.x.nix
···
1
-
{ stdenv, fetchurl, m4, perl }:
1
+
{ stdenv, lib, fetchurl, m4, perl }:
2
2
3
3
stdenv.mkDerivation rec {
4
4
name = "bison-2.7";
···
10
10
11
11
nativeBuildInputs = [ m4 ] ++ stdenv.lib.optional doCheck perl;
12
12
propagatedBuildInputs = [ m4 ];
13
+
14
+
patches = lib.optional stdenv.isDarwin ./darwin-vasnprintf.patch;
13
15
14
16
doCheck = true;
15
17
# M4 = "${m4}/bin/m4";
+12
pkgs/development/tools/parsing/bison/darwin-vasnprintf.patch
+12
pkgs/development/tools/parsing/bison/darwin-vasnprintf.patch
···
1
+
diff -ur bison-2.7-pristine/lib/vasnprintf.c bison-2.7/lib/vasnprintf.c
2
+
--- bison-2.7-pristine/lib/vasnprintf.c 2012-11-30 20:48:23.000000000 +0900
3
+
+++ bison-2.7/lib/vasnprintf.c 2018-06-28 16:55:31.000000000 +0900
4
+
@@ -4870,7 +4870,7 @@
5
+
#endif
6
+
*fbp = dp->conversion;
7
+
#if USE_SNPRINTF
8
+
-# if !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__))
9
+
+# if !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) || (defined __APPLE__ && defined __MACH__))
10
+
fbp[1] = '%';
11
+
fbp[2] = 'n';
12
+
fbp[3] = '\0';