From a8e50feead052ffb45d68c8841eab2f7a329dded Mon Sep 17 00:00:00 2001 From: EEva Date: Mon, 6 Dec 2021 20:25:06 +0200 Subject: [PATCH] Align vcv-rack package with upstream --- pkgs/vcv-rack/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/vcv-rack/default.nix b/pkgs/vcv-rack/default.nix index 51026de..0567f06 100644 --- a/pkgs/vcv-rack/default.nix +++ b/pkgs/vcv-rack/default.nix @@ -1,5 +1,5 @@ -{ gcc11Stdenv, lib, makeWrapper, fetchzip, fetchFromGitHub, pkgconfig -, alsaLib, curl, ghc_filesystem, glew, glfw, gtk3-x11, jansson, jq, libarchive +{ gcc11Stdenv, lib, makeWrapper, fetchzip, fetchFromGitHub, pkg-config +, alsa-lib, curl, ghc_filesystem, glew, glfw, gtk3-x11, jansson, jq, libarchive , libjack2, libpulseaudio, libXext, libXi, rtaudio, rtmidi, speex , libsamplerate, zstd, wrapGAppsHook }: @@ -24,6 +24,8 @@ with lib; gcc11Stdenv.mkDerivation rec { repo = "Rack"; rev = "v${version}"; sha256 = "gy+YiYhgBO9eoEBP0PmteVjfaJWWIa/Ye9tvJG1b6aw="; + # The project pins some source dependencies (see below) + fetchSubmodules = true; }; patches = [ @@ -49,8 +51,8 @@ with lib; gcc11Stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ makeWrapper pkgconfig wrapGAppsHook ]; - buildInputs = [ alsaLib curl ghc_filesystem glew glfw gtk3-x11 jansson jq libarchive libjack2 libpulseaudio libsamplerate rtaudio rtmidi speex zstd ]; + nativeBuildInputs = [ makeWrapper pkg-config wrapGAppsHook ]; + buildInputs = [ alsa-lib curl ghc_filesystem glew glfw gtk3-x11 jansson jq libarchive libjack2 libpulseaudio libsamplerate rtaudio rtmidi speex zstd ]; makeFlags = [ "all" "plugins" ];