nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-02 10:14:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #260238 from trofi/blobwars-fix-for-glibc-2.38

Browse Source 
blobwars: fix build against glibc-2.38
This commit is contained in:
Maximilian Bosch 2023-10-13 22:20:23 +02:00 committed by GitHub
commit 59f594f59d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/games/blobwars/blobwars-2.00-glibc-2.38.patch Normal file
View File

@ -0,0 +1,11 @@
--- a/src/headers.h
+++ b/src/headers.h
@@ -56,7 +56,7 @@ extern DECLSPEC int SDLCALL SDL_GetGamma(float *red, float *green, float *blue);
#define textdomain(x) while(false)
#endif
-#if !defined(OpenBSD) && !defined(FreeBSD) && !defined(__APPLE__)
+#if !defined(OpenBSD) && !defined(FreeBSD) && !defined(__APPLE__) && !(defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 38)
static inline void strlcat(char *dest, const char *src, size_t n) { strncat(dest, src, n - 1); }
static inline void strlcpy(char *dest, const char *src, size_t n) { strncpy(dest, src, n); dest[n - 1] = 0; }
#endif

2
pkgs/games/blobwars/default.nix
View File

@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "c406279f6cdf2aed3c6edb8d8be16efeda0217494acd525f39ee2bd3e77e4a99";
};
patches = [ ./blobwars-2.00-glibc-2.38.patch ];
nativeBuildInputs = [ pkg-config gettext ];
buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_net SDL2_ttf zlib ];
env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error" ];