From 58dba3b4da2aa68cfb55da18065616161f8637c2 Mon Sep 17 00:00:00 2001
From: matthewcroughan <matt@croughan.sh>
Date: Wed, 20 Nov 2024 02:54:49 +0000
Subject: [PATCH 1/2] cardinal: fix cross-compilation

---
 pkgs/by-name/ca/cardinal/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ca/cardinal/package.nix b/pkgs/by-name/ca/cardinal/package.nix
index a9d653b2f0f2..b516702ec8b7 100644
--- a/pkgs/by-name/ca/cardinal/package.nix
+++ b/pkgs/by-name/ca/cardinal/package.nix
@@ -69,7 +69,9 @@ stdenv.mkDerivation rec {
   ];
 
   hardeningDisable = [ "format" ];
-  makeFlags = lib.optional headless "HEADLESS=true" ++ [ "SYSDEPS=true" "PREFIX=$(out)" ];
+  makeFlags = [ "SYSDEPS=true" "PREFIX=$(out)" ]
+  ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "CROSS_COMPILING=true"
+  ++ lib.optional headless "HEADLESS=true";
 
   postInstall = ''
     wrapProgram $out/bin/Cardinal \

From 6a668a7390eef6d703c731922abccb102a81bdae Mon Sep 17 00:00:00 2001
From: matthewcroughan <matt@croughan.sh>
Date: Wed, 20 Nov 2024 02:55:19 +0000
Subject: [PATCH 2/2] cardinal: nixfmt

---
 pkgs/by-name/ca/cardinal/package.nix | 66 ++++++++++++++++------------
 1 file changed, 37 insertions(+), 29 deletions(-)

diff --git a/pkgs/by-name/ca/cardinal/package.nix b/pkgs/by-name/ca/cardinal/package.nix
index b516702ec8b7..a0307bb8c7a4 100644
--- a/pkgs/by-name/ca/cardinal/package.nix
+++ b/pkgs/by-name/ca/cardinal/package.nix
@@ -1,28 +1,29 @@
-{ stdenv
-, fetchurl
-, cmake
-, dbus
-, fftwFloat
-, file
-, freetype
-, jansson
-, lib
-, libGL
-, libX11
-, libXcursor
-, libXext
-, libXrandr
-, libarchive
-, libjack2
-, liblo
-, libsamplerate
-, libsndfile
-, makeWrapper
-, pkg-config
-, python3
-, speexdsp
-, libglvnd
-, headless ? false
+{
+  stdenv,
+  fetchurl,
+  cmake,
+  dbus,
+  fftwFloat,
+  file,
+  freetype,
+  jansson,
+  lib,
+  libGL,
+  libX11,
+  libXcursor,
+  libXext,
+  libXrandr,
+  libarchive,
+  libjack2,
+  liblo,
+  libsamplerate,
+  libsndfile,
+  makeWrapper,
+  pkg-config,
+  python3,
+  speexdsp,
+  libglvnd,
+  headless ? false,
 }:
 
 stdenv.mkDerivation rec {
@@ -69,9 +70,13 @@ stdenv.mkDerivation rec {
   ];
 
   hardeningDisable = [ "format" ];
-  makeFlags = [ "SYSDEPS=true" "PREFIX=$(out)" ]
-  ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "CROSS_COMPILING=true"
-  ++ lib.optional headless "HEADLESS=true";
+  makeFlags =
+    [
+      "SYSDEPS=true"
+      "PREFIX=$(out)"
+    ]
+    ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "CROSS_COMPILING=true"
+    ++ lib.optional headless "HEADLESS=true";
 
   postInstall = ''
     wrapProgram $out/bin/Cardinal \
@@ -88,7 +93,10 @@ stdenv.mkDerivation rec {
     description = "Plugin wrapper around VCV Rack";
     homepage = "https://github.com/DISTRHO/cardinal";
     license = lib.licenses.gpl3;
-    maintainers = with lib.maintainers; [ magnetophon PowerUser64 ];
+    maintainers = with lib.maintainers; [
+      magnetophon
+      PowerUser64
+    ];
     mainProgram = "Cardinal";
     platforms = lib.platforms.all;
     # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs