mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-10-03 21:40:12 +00:00
rPackages.PICS: fix build
Strict R headers are now the default. This removes the legacy definitions of ‘PI’, ‘Calloc’, ‘Realloc’ and ‘Free’: use ‘M_PI’, ‘R_Calloc’, ‘R_Realloc’ or ‘R_Free’ instead.
This commit is contained in:
@@ -1787,6 +1787,14 @@ let
|
||||
'';
|
||||
});
|
||||
|
||||
PICS = old.PICS.overrideAttrs (attrs: {
|
||||
postPatch = ''
|
||||
# https://developer.r-project.org/blosxom.cgi/R-devel/NEWS/2025/01/08#n2025-01-08
|
||||
substituteInPlace "src/segment.c" \
|
||||
--replace-fail "Calloc" "R_Calloc"
|
||||
'';
|
||||
});
|
||||
|
||||
lwgeom = old.lwgeom.overrideAttrs (attrs: {
|
||||
configureFlags = [
|
||||
"--with-proj-lib=${pkgs.lib.getLib pkgs.proj}/lib"
|
||||
|
||||
Reference in New Issue
Block a user