From b5750fef58d69921f8522b77cc05998c8dad8ac2 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 3 Nov 2023 22:15:04 +0000 Subject: [PATCH] deadbeef: fix build against clang-16 Without the change build fails as https://cache.nixos.org/log/848ky6rxa8v0wzy72gyrv15v7my7f22c-deadbeef-1.9.5.drv libbinio/binio.cpp:498:3: error: ISO C++17 does not allow 'register' storage class specifier [-Wregister] register long bits; The change allies the fix similar to upstream fix from https://github.com/DeaDBeeF-Player/deadbeef/issues/3012 but without the patch conflict. --- pkgs/applications/audio/deadbeef/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix index 34b4b7ab1883..f2627d65ff56 100644 --- a/pkgs/applications/audio/deadbeef/default.nix +++ b/pkgs/applications/audio/deadbeef/default.nix @@ -121,6 +121,13 @@ in clangStdenv.mkDerivation { ./autogen.sh ''; + postPatch = '' + # Fix the build on c++17 compiler: + # https://github.com/DeaDBeeF-Player/deadbeef/issues/3012 + # TODO: remove after 1.9.5 release. + substituteInPlace plugins/adplug/Makefile.am --replace 'adplug_la_CXXFLAGS = ' 'adplug_la_CXXFLAGS = -std=c++11 ' + ''; + meta = with lib; { description = "Ultimate Music Player for GNU/Linux"; homepage = "http://deadbeef.sourceforge.net/";