diff options
author | Manuel Frischknecht <manuel.frischknecht@macd.com> | 2024-01-30 22:10:06 +0100 |
---|---|---|
committer | Manuel Frischknecht <manuel.frischknecht@gmail.com> | 2024-02-01 07:50:53 +0000 |
commit | be671135143f960d0817154c781f270167c6427a (patch) | |
tree | b7479c856d54286cb6ae046de869ce670052225c /pkgs/applications/audio/grandorgue | |
parent | 056a4d8d52b00ac50eb4aacf56ab15e111bea0c1 (diff) |
grandorgue: 3.11.0 -> 3.14.0
`grandorgue` failed to build because GCC 13 stopped transitively including some headers like `cstdint` in a lot of situations, leading to many references to types like `uint8_t` in old C++ code breaking unless the respective include statements were included directly in the referring code. This build issue is already fixed upstream, and updating the package to the current release (3.14.0) fixes the build.
Diffstat (limited to 'pkgs/applications/audio/grandorgue')
-rw-r--r-- | pkgs/applications/audio/grandorgue/default.nix | 31 |
1 files changed, 24 insertions, 7 deletions
diff --git a/pkgs/applications/audio/grandorgue/default.nix b/pkgs/applications/audio/grandorgue/default.nix index 9856b81c92b86..6ca3f39a9dc08 100644 --- a/pkgs/applications/audio/grandorgue/default.nix +++ b/pkgs/applications/audio/grandorgue/default.nix @@ -1,18 +1,34 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, fftwFloat, alsa-lib -, zlib, wavpack, wxGTK32, udev, jackaudioSupport ? false, libjack2 -, imagemagick, libicns, makeWrapper, Cocoa -, includeDemo ? true }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, fftwFloat +, alsa-lib +, zlib +, wavpack +, wxGTK32 +, udev +, jackaudioSupport ? false +, libjack2 +, imagemagick +, libicns +, yaml-cpp +, makeWrapper +, Cocoa +, includeDemo ? true +}: stdenv.mkDerivation rec { pname = "grandorgue"; - version = "3.11.0"; + version = "3.14.0"; src = fetchFromGitHub { owner = "GrandOrgue"; repo = pname; rev = version; fetchSubmodules = true; - sha256 = "sha256-l1KqER/vkNwgKLXIFUzHnYLw2ivGNP7hRiKhIOzn7pw="; + hash = "sha256-kPz11V2yNmBe80egNLYxh/m2B1nDca3C5sGbEnrkqnw="; }; postPatch = '' @@ -24,7 +40,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config imagemagick libicns makeWrapper ]; - buildInputs = [ fftwFloat zlib wavpack wxGTK32 ] + buildInputs = [ fftwFloat zlib wavpack wxGTK32 yaml-cpp ] ++ lib.optionals stdenv.isLinux [ alsa-lib udev ] ++ lib.optionals stdenv.isDarwin [ Cocoa ] ++ lib.optional jackaudioSupport libjack2; @@ -53,5 +69,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.puzzlewolf ]; + mainProgram = "GrandOrgue"; }; } |