Merge pull request #177819 from ddelabru/update-vcv-to-v2

vcv-rack: 1.1.6 -> 2.0.6
This commit is contained in:
Doron Behar 2022-06-18 10:34:21 +03:00 committed by GitHub
commit a7a11f989d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 156 additions and 45 deletions

View File

@ -1,50 +1,107 @@
{ lib, stdenv, makeWrapper, fetchzip, fetchFromGitHub, pkg-config
, alsa-lib, curl, glew, glfw, gtk2-x11, jansson, libjack2, libXext, libXi
, libzip, rtaudio, rtmidi, speex, libsamplerate }:
{ alsa-lib
, copyDesktopItems
, curl
, fetchFromBitbucket
, fetchFromGitHub
, fetchzip
, ghc_filesystem
, glew
, glfw
, gnome
, gtk3-x11
, imagemagick
, jansson
, jq
, lib
, libarchive
, libicns
, libjack2
, libpulseaudio
, libsamplerate
, libXext
, libXi
, makeDesktopItem
, makeWrapper
, pkg-config
, rtaudio
, rtmidi
, speex
, stdenv
, wrapGAppsHook
, zstd
}:
let
# The package repo vendors some of the package dependencies as submodules.
# Others are downloaded with `make deps`. Due to previous issues with the
# `glfw` submodule (see above) and because we can not access the network when
# building in a sandbox, we fetch the dependency source manually.
pfft-source = fetchzip {
url = "https://vcvrack.com/downloads/dep/pffft.zip";
sha256 = "084csgqa6f1a270bhybjayrh3mpyi2jimc87qkdgsqcp8ycsx1l1";
# Unfortunately, they are not pinned, so we have no guarantee that they
# will be stable, and therefore, we can't use them directly. Instead
# we'll have to fetch them separately ourselves.
pffft-source = fetchFromBitbucket {
owner = "jpommier";
repo = "pffft";
rev = "988259a41d1522047a9420e6265a6ba8289c1654";
sha256 = "Oq5N02UNXsbhcPUfjMtD0cgqAZsGx9ke9A+ArrenzGE=";
};
fuzzysearchdatabase-source = fetchFromBitbucket {
owner = "j_norberg";
repo = "fuzzysearchdatabase";
rev = "fe62479811e503ef3c091f5a859d27bfcf0a44da";
sha256 = "zgeUzuuInHPeveBIjlivRGIz+NSb7cW/9hMndxm6qOA=";
};
nanovg-source = fetchFromGitHub {
owner = "memononen";
owner = "VCVRack";
repo = "nanovg";
rev = "1f9c8864fc556a1be4d4bf1d6bfe20cde25734b4";
sha256 = "08r15zrr6p1kxigxzxrg5rgya7wwbdx7d078r362qbkmws83wk27";
rev = "0bebdb314aff9cfa28fde4744bcb037a2b3fd756";
sha256 = "HmQhCE/zIKc3f+Zld229s5i5MWzRrBMF9gYrn8JVQzg=";
};
nanosvg-source = fetchFromGitHub {
owner = "memononen";
repo = "nanosvg";
rev = "25241c5a8f8451d41ab1b02ab2d865b01600d949";
sha256 = "114qgfmazsdl53rm4pgqif3gv8msdmfwi91lyc2jfadgzfd83xkg";
rev = "ccdb1995134d340a93fb20e3a3d323ccb3838dd0";
sha256 = "ymziU0NgGqxPOKHwGm0QyEdK/8jL/QYk5UdIQ3Tn8jw=";
};
osdialog-source = fetchFromGitHub {
owner = "AndrewBelt";
repo = "osdialog";
rev = "e5db5de6444f4b2c4e1390c67b3efd718080c3da";
sha256 = "0iqxn1md053nl19hbjk8rqsdcmjwa5l5z0ci4fara77q43rc323i";
rev = "21b9dcc2a1bbdacb9b46da477ffd82a4ce9204b9";
sha256 = "+4VCBuQvfiuEUdjFu3IB2FwbHFrDJXTb4vcVg6ZFwSM=";
};
oui-blendish-source = fetchFromGitHub {
owner = "AndrewBelt";
repo = "oui-blendish";
rev = "79ec59e6bc7201017fc13a20c6e33380adca1660";
sha256 = "17kd0lh2x3x12bxkyhq6z8sg6vxln8m9qirf0basvcsmylr6rb64";
rev = "2fc6405883f8451944ed080547d073c8f9f31898";
sha256 = "/QZFZuI5kSsEvSfMJlcqB1HiZ9Vcf3vqLqWIMEgxQK8=";
};
fundamental-source = fetchFromGitHub {
owner = "VCVRack";
repo = "Fundamental";
rev = "533397cdcad5c6401ebd3937d6c1663de2473627"; # tip of branch v2
sha256 = "QnwOgrYxiCa/7t/u6F63Ks8C9E8k6T+hia4JZFhp1LI=";
};
in
with lib; stdenv.mkDerivation rec {
stdenv.mkDerivation rec {
pname = "VCV-Rack";
version = "1.1.6";
version = "2.0.6";
desktopItems = [
(makeDesktopItem {
type = "Application";
name = pname;
desktopName = "VCV Rack";
genericName = "Eurorack simulator";
comment = "Create music by patching together virtual synthesizer modules";
exec = "Rack";
icon = "Rack";
categories = [ "AudioVideo" "AudioVideoEditing" "Audio" ];
keywords = [ "music" ];
})
];
src = fetchFromGitHub {
owner = "VCVRack";
repo = "Rack";
rev = "v${version}";
sha256 = "0ji64prr74qzxf5bx1sw022kbslx9nzll16lmk5in78hbl137b3i";
sha256 = "vvGx8tnE7gMiboVUTywIzBB1q/IfiJ8TPnSHvmfHUQg=";
};
patches = [
@ -56,46 +113,101 @@ with lib; stdenv.mkDerivation rec {
# above), we do it here manually
mkdir -p dep/include
cp -r ${pfft-source} dep/jpommier-pffft-source
cp -r ${pffft-source}/* dep/pffft
cp -r ${fuzzysearchdatabase-source}/* dep/fuzzysearchdatabase
cp -r ${nanovg-source}/* dep/nanovg
cp -r ${nanosvg-source}/* dep/nanosvg
cp -r ${osdialog-source}/* dep/osdialog
cp -r ${oui-blendish-source}/* dep/oui-blendish
cp dep/jpommier-pffft-source/*.h dep/include
cp dep/pffft/*.h dep/include
cp dep/fuzzysearchdatabase/src/*.hpp dep/include
cp dep/nanosvg/**/*.h dep/include
cp dep/nanovg/src/*.h dep/include
cp dep/osdialog/*.h dep/include
cp dep/oui-blendish/*.h dep/include
substituteInPlace include/audio.hpp --replace "<RtAudio.h>" "<rtaudio/RtAudio.h>"
substituteInPlace compile.mk --replace "-march=nocona" ""
# Build and dist the Fundamental plugins
cp -r ${fundamental-source} plugins/Fundamental/
chmod -R +rw plugins/Fundamental # will be used as build dir
substituteInPlace plugin.mk --replace ":= all" ":= dist"
# Fix reference to zenity
substituteInPlace dep/osdialog/osdialog_zenity.c \
--replace 'zenityBin[] = "zenity"' 'zenityBin[] = "${gnome.zenity}/bin/zenity"'
'';
enableParallelBuilding = true;
nativeBuildInputs = [ makeWrapper pkg-config ];
buildInputs = [ alsa-lib curl glew glfw gtk2-x11 jansson libjack2 libsamplerate libzip rtaudio rtmidi speex ];
nativeBuildInputs = [
copyDesktopItems
imagemagick
jq
libicns
makeWrapper
pkg-config
wrapGAppsHook
];
buildInputs = [
alsa-lib
curl
ghc_filesystem
glew
glfw
gnome.zenity
gtk3-x11
jansson
libarchive
libjack2
libpulseaudio
libsamplerate
rtaudio
rtmidi
speex
zstd
];
buildFlags = [ "Rack" ];
makeFlags = [ "all" "plugins" ];
installPhase = ''
runHook preInstall
install -D -m755 -t $out/bin Rack
install -D -m755 -t $out/lib libRack.so
mkdir -p $out/share/vcv-rack
cp -r res Core.json template.vcv LICENSE* cacert.pem $out/share/vcv-rack
cp -r res cacert.pem Core.json template.vcv LICENSE-GPLv3.txt $out/share/vcv-rack
cp -r plugins/Fundamental/dist/Fundamental-*.vcvplugin $out/share/vcv-rack/Fundamental.vcvplugin
# Override the default global resource file directory
wrapProgram $out/bin/Rack --add-flags "-s $out/share/vcv-rack"
# Extract pngs from the Apple icon image and create
# the missing ones from the 1024x1024 image.
icns2png --extract icon.icns
for size in 16 24 32 48 64 128 256 512 1024; do
mkdir -pv $out/share/icons/hicolor/"$size"x"$size"/apps
if [ ! -e icon_"$size"x"$size"x32.png ] ; then
convert -resize "$size"x"$size" icon_1024x1024x32.png icon_"$size"x"$size"x32.png
fi
install -Dm644 icon_"$size"x"$size"x32.png $out/share/icons/hicolor/"$size"x"$size"/apps/Rack.png
done;
runHook postInstall
'';
dontWrapGApps = true;
postFixup = ''
# Wrap gApp and override the default global resource file directory
wrapProgram $out/bin/Rack \
"''${gappsWrapperArgs[@]}" \
--add-flags "-s $out/share/vcv-rack"
'';
meta = with lib; {
description = "Open-source virtual modular synthesizer";
homepage = "https://vcvrack.com/";
# The source is BSD-3 licensed, some of the art is CC-BY-NC 4.0 or under a
# The source is GPL3+ licensed, some of the art is CC-BY-NC 4.0 or under a
# no-derivatives clause
license = with licenses; [ bsd3 cc-by-nc-40 unfreeRedistributable ];
maintainers = with maintainers; [ moredread nathyong ];
license = with licenses; [ gpl3Plus cc-by-nc-40 unfreeRedistributable ];
maintainers = with maintainers; [ nathyong jpotier ddelabru ];
platforms = platforms.linux;
};
}

View File

@ -1,13 +1,12 @@
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
@@ -21,8 +21,8 @@
build/dep/osdialog/osdialog_gtk2.c.o: FLAGS += $(shell pkg-config --cflags gtk+-2.0)
@@ -36,7 +36,7 @@ build/dep/osdialog/osdialog_gtk3.c.o: FLAGS += $(shell pkg-config --cflags gtk+-
LDFLAGS += -rdynamic \
- dep/lib/libGLEW.a dep/lib/libglfw3.a dep/lib/libjansson.a dep/lib/libcurl.a dep/lib/libssl.a dep/lib/libcrypto.a dep/lib/libzip.a dep/lib/libz.a dep/lib/libspeexdsp.a dep/lib/libsamplerate.a dep/lib/librtmidi.a dep/lib/librtaudio.a \
+ -lGLEW -lglfw -ljansson -lcurl -lssl -lcrypto -lzip -lz -lspeexdsp -lsamplerate -lrtmidi -lrtaudio \
-lpthread -lGL -ldl -lX11 -lasound -ljack \
$(shell pkg-config --libs gtk+-2.0)
TARGET := Rack
endif
LDFLAGS += -Wl,--whole-archive
LDFLAGS += -static-libstdc++ -static-libgcc
- LDFLAGS += dep/lib/libGLEW.a dep/lib/libglfw3.a dep/lib/libjansson.a dep/lib/libcurl.a dep/lib/libssl.a dep/lib/libcrypto.a dep/lib/libarchive.a dep/lib/libzstd.a dep/lib/libspeexdsp.a dep/lib/libsamplerate.a dep/lib/librtmidi.a dep/lib/librtaudio.a
+ 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)