From c06d108c276991ee56c2cca9a84d813a7c66b1c1 Mon Sep 17 00:00:00 2001 From: Zhong Jianxin Date: Mon, 4 Nov 2024 19:50:26 +0800 Subject: [PATCH 1/2] SDL_gpu: Format using nixfmt-rfc-style --- pkgs/by-name/sd/SDL_gpu/package.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sd/SDL_gpu/package.nix b/pkgs/by-name/sd/SDL_gpu/package.nix index 5165099d4488..2b0d9865f7bd 100644 --- a/pkgs/by-name/sd/SDL_gpu/package.nix +++ b/pkgs/by-name/sd/SDL_gpu/package.nix @@ -37,7 +37,10 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "SDL_gpu_BUILD_TESTS" false) ]; - outputs = [ "out" "dev" ]; + outputs = [ + "out" + "dev" + ]; strictDeps = true; @@ -45,8 +48,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Library for high-performance, modern 2D graphics with SDL written in C"; homepage = "https://grimfang4.github.io/sdl-gpu"; license = lib.licenses.mit; - maintainers = lib.teams.sdl.members - ++ (with lib.maintainers; [ ]); + maintainers = lib.teams.sdl.members ++ (with lib.maintainers; [ ]); inherit (SDL2.meta) platforms; }; }) From 083d0095e65a6608d3cb8375d72d0e38a10b512e Mon Sep 17 00:00:00 2001 From: Zhong Jianxin Date: Mon, 4 Nov 2024 20:01:29 +0800 Subject: [PATCH 2/2] SDL_gpu: Fix build on clang 16 --- pkgs/by-name/sd/SDL_gpu/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/sd/SDL_gpu/package.nix b/pkgs/by-name/sd/SDL_gpu/package.nix index 2b0d9865f7bd..5e9cb88687fa 100644 --- a/pkgs/by-name/sd/SDL_gpu/package.nix +++ b/pkgs/by-name/sd/SDL_gpu/package.nix @@ -30,6 +30,11 @@ stdenv.mkDerivation (finalAttrs: { libGLU ]; + # error: incompatible function pointer types assigning to 'GPU_Image *(*)(GPU_Renderer *, SDL_Surface *, GPU_Rect *)'... + env.NIX_CFLAGS_COMPILE = lib.optionalString ( + stdenv.cc.isClang && lib.versionAtLeast stdenv.cc.version "16" + ) "-Wno-error=incompatible-function-pointer-types"; + cmakeFlags = [ (lib.cmakeBool "SDL_gpu_BUILD_DEMOS" false) (lib.cmakeBool "SDL_gpu_BUILD_TOOLS" false)