From 463ab8deaa17d333be2ff7c61bea4e8e664e71cb Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Tue, 14 Feb 2023 19:29:36 +0800
Subject: [PATCH 1/2] Revert "libvisual: fix null malloc check on cross"

This reverts commit a656aeb7f134a3ac8376dcf527cf29327d2d796e.

As of now these flags are no longer required for cross compilation
---
 pkgs/development/libraries/libvisual/default.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/development/libraries/libvisual/default.nix b/pkgs/development/libraries/libvisual/default.nix
index f32ee433694c..d7bf28a94e4c 100644
--- a/pkgs/development/libraries/libvisual/default.nix
+++ b/pkgs/development/libraries/libvisual/default.nix
@@ -18,11 +18,6 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ SDL glib ];
 
-  configureFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-    "ac_cv_func_malloc_0_nonnull=yes"
-    "ac_cv_func_realloc_0_nonnull=yes"
-  ];
-
   meta = {
     description = "An abstraction library for audio visualisations";
     homepage = "https://sourceforge.net/projects/libvisual/";

From 11b095e8805aa123a4d77a5e706bebaf86622879 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Tue, 14 Feb 2023 19:35:00 +0800
Subject: [PATCH 2/2] libvisual: disable building examples when cross compiling

the examples depend on SDL, and sdl-config is not available when crossing
---
 pkgs/development/libraries/libvisual/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libvisual/default.nix b/pkgs/development/libraries/libvisual/default.nix
index d7bf28a94e4c..b58c25401c90 100644
--- a/pkgs/development/libraries/libvisual/default.nix
+++ b/pkgs/development/libraries/libvisual/default.nix
@@ -4,6 +4,8 @@
 , SDL
 , glib
 , pkg-config
+  # sdl-config is not available when crossing
+, withExamples ? stdenv.buildPlatform == stdenv.hostPlatform
 }:
 
 stdenv.mkDerivation rec {
@@ -16,7 +18,9 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ SDL glib ];
+  buildInputs = lib.optional withExamples SDL ++ [ glib ];
+
+  configureFlags = lib.optional (!withExamples) "--disable-examples";
 
   meta = {
     description = "An abstraction library for audio visualisations";