Merge pull request #203547 from ddelabru/vcv-rack

vcv-rack: 2.1.2 -> 2.2.0

pkgs/applications/audio/vcv-rack/default.nix

@@ -25,7 +25,7 @@
 , makeWrapper
 , pkg-config
 , rtmidi
-, speex
+, speexdsp
 , stdenv
 , wrapGAppsHook
 , zstd
@@ -45,8 +45,8 @@ let
   fuzzysearchdatabase-source = fetchFromBitbucket {
     owner = "j_norberg";
     repo = "fuzzysearchdatabase";
-    rev = "fe62479811e503ef3c091f5a859d27bfcf0a44da";
-    sha256 = "zgeUzuuInHPeveBIjlivRGIz+NSb7cW/9hMndxm6qOA=";
+    rev = "a3a1bf557b8e6ee58b55fa82ff77ff7a3d141949";
+    sha256 = "13ib72acbxn1cnf66im0v4nlr1464v7j08ra2bprznjmy127xckm";
   };
   nanovg-source = fetchFromGitHub {
     owner = "VCVRack";
@@ -72,11 +72,23 @@ let
     rev = "2fc6405883f8451944ed080547d073c8f9f31898";
     sha256 = "/QZFZuI5kSsEvSfMJlcqB1HiZ9Vcf3vqLqWIMEgxQK8=";
   };
+  simde-source = fetchFromGitHub {
+    owner = "simd-everywhere";
+    repo = "simde";
+    rev = "dd0b662fd8cf4b1617dbbb4d08aa053e512b08e4";
+    sha256 = "1kxwzdlh21scak7wsbb60vwfvndppidj5fgbi26mmh73zsj02mnv";
+  };
+  tinyexpr-source = fetchFromGitHub {
+    owner = "codeplea";
+    repo = "tinyexpr";
+    rev = "4e8cc0067a1e2378faae23eb2dfdd21e9e9907c2";
+    sha256 = "1yxkxsw3bc81cjm2knvyr1z9rlzwmjvq5zd125n34xwq568v904d";
+  };
   fundamental-source = fetchFromGitHub {
     owner = "VCVRack";
     repo = "Fundamental";
-    rev = "03bd00b96ad19e0575939bb7a0b8b08eff22f076"; # tip of branch v2
-    sha256 = "1rd5yvdr6k03mc3r2y7wxhmiqd69jfvqmpqagxb83y1mn0zfv0pr";
+    rev = "f80e1a0e78dc043a0ff0b777ef98a36b91063622"; # tip of branch v2
+    sha256 = "0hnwrr1xhf7dpkw1v63f633x5dlrvijgbah4aj5h5xr2jchip9nx";
   };
   vcv-rtaudio = stdenv.mkDerivation rec {
     pname = "vcv-rtaudio";
@@ -103,7 +115,7 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "VCV-Rack";
-  version = "2.1.2";
+  version = "2.2.0";
 
   desktopItems = [
     (makeDesktopItem {
@@ -123,7 +135,7 @@ stdenv.mkDerivation rec {
     owner = "VCVRack";
     repo = "Rack";
     rev = "v${version}";
-    sha256 = "0583izk3j36mg7wm30ss2387j9dqsbbxkxrdh3993azb4q5naf02";
+    sha256 = "1ag1syjxdzxx13pdcfga9ksc6a5hw9bcdfhbry8qd2pxs9lmv2q6";
   };
 
   patches = [
@@ -141,6 +153,8 @@ stdenv.mkDerivation rec {
     cp -r ${nanosvg-source}/* dep/nanosvg
     cp -r ${osdialog-source}/* dep/osdialog
     cp -r ${oui-blendish-source}/* dep/oui-blendish
+    cp -r ${simde-source}/* dep/simde
+    cp -r ${tinyexpr-source}/* dep/tinyexpr
 
     cp dep/pffft/*.h dep/include
     cp dep/fuzzysearchdatabase/src/*.hpp dep/include
@@ -148,6 +162,8 @@ stdenv.mkDerivation rec {
     cp dep/nanovg/src/*.h dep/include
     cp dep/osdialog/*.h dep/include
     cp dep/oui-blendish/*.h dep/include
+    cp -r dep/simde/simde dep/include
+    cp dep/tinyexpr/tinyexpr.h dep/include
 
     # Build and dist the Fundamental plugins
     cp -r ${fundamental-source} plugins/Fundamental/
@@ -182,12 +198,19 @@ stdenv.mkDerivation rec {
     libpulseaudio
     libsamplerate
     rtmidi
-    speex
+    speexdsp
     vcv-rtaudio
     zstd
   ];
 
-  makeFlags = [ "all" "plugins" ];
+  makeFlags = [
+    ( if stdenv.hostPlatform.system == "aarch64-linux"
+      then "MACHINE=arm64-linux"
+      else "MACHINE=${stdenv.hostPlatform.config}"
+    )
+    "all"
+    "plugins"
+  ];
 
   installPhase = ''
     runHook preInstall

pkgs/applications/audio/vcv-rack/rack-minimize-vendoring.patch

@@ -1,7 +1,8 @@
-diff -ru a/Makefile b/Makefile
---- a/Makefile 1970-01-01 01:00:01.000000000 +0100
-+++ b/Makefile 1970-01-01 01:00:01.000000000 +0100
-@@ -36,7 +36,7 @@ build/dep/osdialog/osdialog_gtk3.c.o: FLAGS += $(shell pkg-config --cflags gtk+-
+diff --git a/Makefile b/Makefile
+index e1be07d1..309b3b0b 100644
+--- a/Makefile
++++ b/Makefile
+@@ -34,7 +34,7 @@ ifdef ARCH_LIN
  
  	LDFLAGS += -Wl,--whole-archive
  	LDFLAGS += -static-libstdc++ -static-libgcc
@@ -9,4 +10,4 @@ diff -ru a/Makefile b/Makefile
 +	LDFLAGS += -lGLEW -lglfw -ljansson -lcurl -lssl -lcrypto -larchive -lz -lspeexdsp -lsamplerate -lrtmidi -lrtaudio
  	LDFLAGS += -Wl,--no-whole-archive
  	LDFLAGS += -lpthread -lGL -ldl -lX11 -lasound -ljack -lpulse -lpulse-simple
- 	LDFLAGS += $(shell pkg-config --libs gtk+-3.0)
+ endif