From c8cacce22f42dd78a9fa40eaf99ed8d9b0c2d1b7 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Mon, 11 Nov 2024 12:07:33 +0800
Subject: [PATCH 1/2] mar1d: nixfmt

---
 pkgs/by-name/ma/mar1d/package.nix | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/ma/mar1d/package.nix b/pkgs/by-name/ma/mar1d/package.nix
index 0bd6026e32d6..cc9b09b8932b 100644
--- a/pkgs/by-name/ma/mar1d/package.nix
+++ b/pkgs/by-name/ma/mar1d/package.nix
@@ -1,14 +1,15 @@
-{ stdenv
-, lib
-, SDL2
-, SDL2_mixer
-, libGLU
-, libconfig
-, meson
-, ninja
-, pkg-config
-, fetchFromGitHub
-, fetchpatch
+{
+  stdenv,
+  lib,
+  SDL2,
+  SDL2_mixer,
+  libGLU,
+  libconfig,
+  meson,
+  ninja,
+  pkg-config,
+  fetchFromGitHub,
+  fetchpatch,
 }:
 
 stdenv.mkDerivation rec {
@@ -22,7 +23,11 @@ stdenv.mkDerivation rec {
     owner = "Radvendii";
   };
 
-  nativeBuildInputs = [ meson ninja pkg-config ];
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+  ];
 
   buildInputs = [
     SDL2

From 49fb875eeec0c603d30b20da61c4437e0db92ca5 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Mon, 11 Nov 2024 12:23:16 +0800
Subject: [PATCH 2/2] mar1d: fix build

---
 pkgs/by-name/ma/mar1d/package.nix | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ma/mar1d/package.nix b/pkgs/by-name/ma/mar1d/package.nix
index cc9b09b8932b..60e4d5ad3552 100644
--- a/pkgs/by-name/ma/mar1d/package.nix
+++ b/pkgs/by-name/ma/mar1d/package.nix
@@ -12,7 +12,7 @@
   fetchpatch,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs:{
   pname = "MAR1D";
   version = "unstable-2023-02-02";
 
@@ -23,6 +23,12 @@ stdenv.mkDerivation rec {
     owner = "Radvendii";
   };
 
+  env = {
+    NIXPKGS_CFLAGS_COMPILE = toString [
+      "-Wno-error=array-parameter"
+    ];
+  };
+
   nativeBuildInputs = [
     meson
     ninja
@@ -45,7 +51,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  meta = with lib; {
+  meta = {
     description = "First person Super Mario Bros";
     mainProgram = "MAR1D";
     longDescription = ''
@@ -55,8 +61,8 @@ stdenv.mkDerivation rec {
       You must view the world as mario does, as a one dimensional line.
     '';
     homepage = "https://mar1d.com";
-    license = licenses.agpl3Only;
-    maintainers = with maintainers; [ taeer ];
-    platforms = platforms.unix;
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [ taeer ];
+    platforms = lib.platforms.unix;
   };
-}
+})