From cdd8957e70e0a8609402e329e47955eab9ce49da Mon Sep 17 00:00:00 2001 From: EEva Date: Mon, 17 Jan 2022 22:17:49 +0200 Subject: [PATCH] Fix vcv --- pkgs/vcv-rack/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/vcv-rack/default.nix b/pkgs/vcv-rack/default.nix index e51708b..f0af402 100644 --- a/pkgs/vcv-rack/default.nix +++ b/pkgs/vcv-rack/default.nix @@ -1,7 +1,7 @@ { gcc11Stdenv, lib, makeWrapper, fetchzip, fetchFromGitHub, fetchFromBitbucket , pkg-config, alsa-lib, curl, ghc_filesystem, glew, glfw, gtk3-x11, jansson, jq , libarchive, libjack2, libpulseaudio, libXext, libXi, rtaudio, rtmidi, speex -, libsamplerate, zstd, wrapGAppsHook }: +, libsamplerate, zstd, wrapGAppsHook, gnome }: let # The package repo vendors some of the package dependencies as submodules. @@ -35,8 +35,8 @@ let osdialog-source = fetchFromGitHub { owner = "AndrewBelt"; repo = "osdialog"; - rev = "e5faf7ea0fce3104bf0c8f2c0e8a5a2e454ed42f"; - sha256 = "5b+OjaoP5hRs53UED0Z5ro2HD/75K5NyzKQiO5pNBEU="; + rev = "21b9dcc2a1bbdacb9b46da477ffd82a4ce9204b9"; + sha256 = "+4VCBuQvfiuEUdjFu3IB2FwbHFrDJXTb4vcVg6ZFwSM="; }; oui-blendish-source = fetchFromGitHub { owner = "AndrewBelt"; @@ -93,12 +93,16 @@ with lib; gcc11Stdenv.mkDerivation rec { 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 wrapGAppsHook jq ]; - buildInputs = [ alsa-lib curl ghc_filesystem glew glfw gtk3-x11 jansson libarchive libjack2 libpulseaudio libsamplerate rtaudio rtmidi speex zstd ]; + buildInputs = [ alsa-lib curl ghc_filesystem glew glfw gtk3-x11 jansson libarchive libjack2 libpulseaudio libsamplerate rtaudio rtmidi speex zstd gnome.zenity ]; makeFlags = [ "all" "plugins" ];