From bc63d4eab40e3b9fa3fbe773974971db37890ba2 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 16 Jan 2022 17:44:45 +0000 Subject: [PATCH] aumix: fix build against fno-common toolchains Pull Gentoo fix to avoid build failures like: $ nix build --impure --expr 'with import ./.{}; aumix.override { stdenv = clang12Stdenv; }' -L ... aumix> ld: mouse.o:/build/aumix-2.9.1/src/./common.h:132: multiple definition of `ourlevel'; common.o:/build/aumix-2.9.1/src/./common.h:132: first defined here --- pkgs/applications/audio/aumix/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/applications/audio/aumix/default.nix b/pkgs/applications/audio/aumix/default.nix index 51dda20cc3a1..2603e88fcbdb 100644 --- a/pkgs/applications/audio/aumix/default.nix +++ b/pkgs/applications/audio/aumix/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , gettext , ncurses , gtkGUI ? false @@ -17,6 +18,16 @@ stdenv.mkDerivation rec { sha256 = "0a8fwyxnc5qdxff8sl2sfsbnvgh6pkij4yafiln0fxgg6bal7knj"; }; + patches = [ + # Pull Gentoo fix for -fno-common toolchains. Upstream does not + # seem to have the contacts + (fetchpatch { + name = "fno-common.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-sound/aumix/files/aumix-2.9.1-fno-common.patch?id=496c9ec7355f06f6d1d19be780a6981503e6df1f"; + sha256 = "0qwylhx1hawsmx1pc7ykrjq9phksc73dq9rss6ggq15n3ggnc95y"; + }) + ]; + buildInputs = [ gettext ncurses ] ++ lib.optionals gtkGUI [ pkg-config gtk2 ];