From 3cf332fdb895ca61837a3c9ff1b8aeaf83c09938 Mon Sep 17 00:00:00 2001
From: Dominic Delabruere <ddelabru@redhat.com>
Date: Wed, 7 Dec 2022 22:37:24 -0500
Subject: [PATCH] vcv-rack: 2.2.0 -> 2.2.1

This is a very minor update to VCV Rack, but the upstream Makefiles
now recognize `aarch64` in platform strings and accepts a
CROSS_COMPILE environment variable for cross-compiling plugins for
a given target. This commit updates the `makeFlags` accordingly.
---
 pkgs/applications/audio/vcv-rack/default.nix         | 12 +++++-------
 .../audio/vcv-rack/rack-minimize-vendoring.patch     |  2 +-
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/audio/vcv-rack/default.nix b/pkgs/applications/audio/vcv-rack/default.nix
index b4a5c98d8b4..4c7df0f02d5 100644
--- a/pkgs/applications/audio/vcv-rack/default.nix
+++ b/pkgs/applications/audio/vcv-rack/default.nix
@@ -115,7 +115,7 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "VCV-Rack";
-  version = "2.2.0";
+  version = "2.2.1";
 
   desktopItems = [
     (makeDesktopItem {
@@ -135,7 +135,7 @@ stdenv.mkDerivation rec {
     owner = "VCVRack";
     repo = "Rack";
     rev = "v${version}";
-    sha256 = "1ag1syjxdzxx13pdcfga9ksc6a5hw9bcdfhbry8qd2pxs9lmv2q6";
+    sha256 = "079alr6y0101k92v5lrnycljcbifh0hsvklbf4w5ax2zrxnyplq8";
   };
 
   patches = [
@@ -203,11 +203,9 @@ stdenv.mkDerivation rec {
     zstd
   ];
 
-  makeFlags = [
-    ( if stdenv.hostPlatform.system == "aarch64-linux"
-      then "MACHINE=arm64-linux"
-      else "MACHINE=${stdenv.hostPlatform.config}"
-    )
+  makeFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
+    "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
+  ] ++ [
     "all"
     "plugins"
   ];
diff --git a/pkgs/applications/audio/vcv-rack/rack-minimize-vendoring.patch b/pkgs/applications/audio/vcv-rack/rack-minimize-vendoring.patch
index f61fd752607..58f1b1f16f0 100644
--- a/pkgs/applications/audio/vcv-rack/rack-minimize-vendoring.patch
+++ b/pkgs/applications/audio/vcv-rack/rack-minimize-vendoring.patch
@@ -1,5 +1,5 @@
 diff --git a/Makefile b/Makefile
-index e1be07d1..309b3b0b 100644
+index fc7c3af1..c3672c6a 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -34,7 +34,7 @@ ifdef ARCH_LIN