Merge pull request #205099 from ddelabru/vcv-rack

This commit is contained in:
Sandro 2022-12-18 22:28:20 +01:00 committed by GitHub
commit 595f528e07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 8 deletions

View File

@ -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"
];

View File

@ -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