diff options
| author | Nathan Yong <nathyong@users.noreply.github.com> | 2019-10-01 11:53:03 +1000 |
|---|---|---|
| committer | Lassulus <github@lassul.us> | 2019-10-02 21:37:20 +0200 |
| commit | bd1ff8696bd25a5161c34ae35da62ad194900bf5 (patch) | |
| tree | 304ea4a649863524b488e43727c0e65c2bd55a8f /pkgs/applications/audio/vcv-rack | |
| parent | dc00a981b2dc408616f5815e67c6f26c7e96fd16 (diff) | |
vcv-rack: 1.1.4 -> 1.1.5
Diffstat (limited to 'pkgs/applications/audio/vcv-rack')
| -rw-r--r-- | pkgs/applications/audio/vcv-rack/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/audio/vcv-rack/rack-minimize-vendoring.patch | 7 |
2 files changed, 7 insertions, 8 deletions
diff --git a/pkgs/applications/audio/vcv-rack/default.nix b/pkgs/applications/audio/vcv-rack/default.nix index 234b98a893c85..4322bbcbc4386 100644 --- a/pkgs/applications/audio/vcv-rack/default.nix +++ b/pkgs/applications/audio/vcv-rack/default.nix @@ -1,6 +1,6 @@ { stdenv, makeWrapper, fetchFromBitbucket, fetchFromGitHub, pkgconfig , alsaLib, curl, glew, glfw, gtk2-x11, jansson, libjack2, libXext, libXi -, libzip, rtaudio, rtmidi, speex }: +, libzip, rtaudio, rtmidi, speex, libsamplerate }: let glfw-git = glfw.overrideAttrs (oldAttrs: rec { @@ -28,13 +28,13 @@ let in with stdenv.lib; stdenv.mkDerivation rec { pname = "VCV-Rack"; - version = "1.1.4"; + version = "1.1.5"; src = fetchFromGitHub { owner = "VCVRack"; repo = "Rack"; rev = "v${version}"; - sha256 = "04kg0nm7w19s2zfrsxjfl3bs4sy3bzf28kzl4hayzwv480667ybx"; + sha256 = "172v66v2vb6l9dpsq6fb6xn035igwhpjci8w3kz2na3rvmz1bc5w"; fetchSubmodules = true; }; @@ -58,7 +58,7 @@ with stdenv.lib; stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ makeWrapper pkgconfig ]; - buildInputs = [ glfw-git alsaLib curl glew gtk2-x11 jansson libjack2 libzip rtaudio rtmidi speex ]; + buildInputs = [ glfw-git alsaLib curl glew gtk2-x11 jansson libjack2 libzip rtaudio rtmidi speex libsamplerate ]; buildFlags = "Rack"; diff --git a/pkgs/applications/audio/vcv-rack/rack-minimize-vendoring.patch b/pkgs/applications/audio/vcv-rack/rack-minimize-vendoring.patch index eca9c2f13c062..d310d57835e42 100644 --- a/pkgs/applications/audio/vcv-rack/rack-minimize-vendoring.patch +++ b/pkgs/applications/audio/vcv-rack/rack-minimize-vendoring.patch @@ -5,10 +5,9 @@ diff -ru a/Makefile b/Makefile build/dep/osdialog/osdialog_gtk2.c.o: FLAGS += $(shell pkg-config --cflags gtk+-2.0) LDFLAGS += -rdynamic \ -- dep/lib/libglfw3.a dep/lib/libGLEW.a dep/lib/libjansson.a dep/lib/libspeexdsp.a dep/lib/libzip.a dep/lib/libz.a dep/lib/librtmidi.a dep/lib/librtaudio.a dep/lib/libcurl.a dep/lib/libssl.a dep/lib/libcrypto.a \ -- -lpthread -lGL -ldl -lX11 -lasound -ljack \ -+ -lGLEW -ljansson -lspeexdsp -lzip -lz -lrtmidi -lrtaudio -lcurl -lssl -lcrypto \ -+ -lpthread -lGL -ldl -lX11 -lasound -ljack -lglfw \ +- 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 |