diff options
author | 7c6f434c <7c6f434c@mail.ru> | 2024-01-14 13:42:06 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-14 13:42:06 +0000 |
commit | 21c6a516b6055c5089b85446538a3401d94947cf (patch) | |
tree | 2b5cc2e9cb4a62627e0b4eeb418ef932c886ed02 /pkgs/applications/audio | |
parent | 99f4714039e639c6d2dcc0e7f71a6f258c5686bf (diff) | |
parent | 50a49047e1ae37878e34b62abe5feee8eb84bca4 (diff) |
Merge pull request #280768 from trofi/seq66-gcc-13-fix
seq66: fix build against `gcc-13`
Diffstat (limited to 'pkgs/applications/audio')
-rw-r--r-- | pkgs/applications/audio/seq66/default.nix | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/applications/audio/seq66/default.nix b/pkgs/applications/audio/seq66/default.nix index 0132b96790043..8f47ab0b6a20d 100644 --- a/pkgs/applications/audio/seq66/default.nix +++ b/pkgs/applications/audio/seq66/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, qttools, which -, alsa-lib, libjack2, liblo, qtbase +, alsa-lib, libjack2, liblo, qtbase, wrapQtAppsHook }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1jvra1wzlycfpvffnqidk264zw6fyl4fsghkw5256ldk22aalmq9"; }; - nativeBuildInputs = [ autoreconfHook pkg-config qttools which ]; + nativeBuildInputs = [ autoreconfHook pkg-config qttools which wrapQtAppsHook ]; buildInputs = [ alsa-lib libjack2 liblo qtbase ]; @@ -21,17 +21,20 @@ stdenv.mkDerivation rec { for d in libseq66/include libseq66/src libsessions/include libsessions/src seq_qt5/src seq_rtmidi/include seq_rtmidi/src Seqtool/src; do substituteInPlace "$d/Makefile.am" --replace '$(git_info)' '${version}' done + + # gcc-13 headers compatibilty. TODO: try to remove with next version + # update + sed -e '1i #include <cstdint>' -i libseq66/src/os/daemonize.cpp ''; enableParallelBuilding = true; - dontWrapQtApps = true; - meta = with lib; { homepage = "https://github.com/ahlstromcj/seq66"; description = "Loop based midi sequencer with Qt GUI derived from seq24 and sequencer64"; license = licenses.gpl2Plus; maintainers = with maintainers; [ orivej ]; + mainProgram = "qseq66"; platforms = platforms.linux; }; } |