summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorOrivej Desh <orivej@gmx.fr>2017-11-09 10:59:59 +0000
committerOrivej Desh <orivej@gmx.fr>2017-11-09 10:59:59 +0000
commitfd94789a18a7a8dbdad1e6d4085edafa832658b6 (patch)
treed46b834b390f4bdf0cb590f76973279161fcba5c /pkgs/development
parenta477ede8b8206f418e0b0a2e6fae5e40f12d8864 (diff)
downloadnixpkgs-fd94789a18a7a8dbdad1e6d4085edafa832658b6.tar
nixpkgs-fd94789a18a7a8dbdad1e6d4085edafa832658b6.tar.gz
nixpkgs-fd94789a18a7a8dbdad1e6d4085edafa832658b6.tar.bz2
nixpkgs-fd94789a18a7a8dbdad1e6d4085edafa832658b6.tar.lz
nixpkgs-fd94789a18a7a8dbdad1e6d4085edafa832658b6.tar.xz
nixpkgs-fd94789a18a7a8dbdad1e6d4085edafa832658b6.tar.zst
nixpkgs-fd94789a18a7a8dbdad1e6d4085edafa832658b6.zip
ccl: fix build with glibc 2.26
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/compilers/ccl/default.nix10
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix
index 7ece0ffda53..ed7e0357d74 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" \