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.
This commit is contained in:
parent
056a4d8d52
commit
be67113514
1 changed files with 24 additions and 7 deletions
|
@ -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";
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue