JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #31432 from orivej/ccl

Browse Source 
ccl: fix build with glibc 2.26
This commit is contained in:
Orivej Desh 2017-11-09 11:03:27 +00:00 committed by GitHub
commit fb7c7304b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/compilers/ccl/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchsvn, gcc, glibc, m4, coreutils }: { stdenv, fetchsvn, fetchpatch, gcc, glibc, m4, coreutils }:
let let
options = rec { options = rec {
@ -39,12 +39,18 @@ stdenv.mkDerivation rec {
sha256 = cfg.sha256; 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 ]; buildInputs = [ gcc glibc m4 ];
CCL_RUNTIME = cfg.runtime; CCL_RUNTIME = cfg.runtime;
CCL_KERNEL = cfg.kernel; CCL_KERNEL = cfg.kernel;
patchPhase = '' postPatch = ''
substituteInPlace lisp-kernel/${CCL_KERNEL}/Makefile \ substituteInPlace lisp-kernel/${CCL_KERNEL}/Makefile \
--replace "svnversion" "echo ${revision}" \ --replace "svnversion" "echo ${revision}" \
--replace "/bin/rm" "${coreutils}/bin/rm" \ --replace "/bin/rm" "${coreutils}/bin/rm" \