From fd94789a18a7a8dbdad1e6d4085edafa832658b6 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Thu, 9 Nov 2017 10:59:59 +0000 Subject: [PATCH] ccl: fix build with glibc 2.26 --- pkgs/development/compilers/ccl/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix index 7ece0ffda533..ed7e0357d74c 100644 --- a/pkgs/development/compilers/ccl/default.nix +++ b/pkgs/development/compilers/ccl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, gcc, glibc, m4, coreutils }: +{ stdenv, fetchsvn, fetchpatch, gcc, glibc, m4, coreutils }: let options = rec { @@ -39,12 +39,18 @@ stdenv.mkDerivation rec { sha256 = cfg.sha256; }; + patches = fetchpatch { + name = "ccl-1.11-glibc-2.26.patch"; + url = https://patch-diff.githubusercontent.com/raw/Clozure/ccl/pull/80.patch; + sha256 = "02v6287w0nppfpvkn9dyd5rvq2zkgd47ia9gs17hrww2hgzr6agd"; + }; + buildInputs = [ gcc glibc m4 ]; CCL_RUNTIME = cfg.runtime; CCL_KERNEL = cfg.kernel; - patchPhase = '' + postPatch = '' substituteInPlace lisp-kernel/${CCL_KERNEL}/Makefile \ --replace "svnversion" "echo ${revision}" \ --replace "/bin/rm" "${coreutils}/bin/rm" \