From b55d83f112ac82a05e8edcc7d5502da73c59e173 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 9 Jul 2022 08:18:37 +0100 Subject: [PATCH] decoder: pull patch pending upstream inclusion for -fno-common toolchains Without the change build fails on `staging` as: ld: decoder.o:(.bss.usageScreen+0x0): multiple definition of `usageScreen'; errors.o:(.bss.usageScreen+0x0): first defined here --- pkgs/tools/security/decoder/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/tools/security/decoder/default.nix b/pkgs/tools/security/decoder/default.nix index baaacac5da8a..76dd3003d500 100644 --- a/pkgs/tools/security/decoder/default.nix +++ b/pkgs/tools/security/decoder/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , openssl }: @@ -15,6 +16,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-1sT1/iwtc2ievmLuNuooy9b14pTs1ZC5noDwzFelk7w="; }; + patches = [ + # Pull fix pending upstream inclusion for -fno-common toolchains: + # https://github.com/PeterPawn/decoder/pull/29 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/PeterPawn/decoder/commit/843ac477c31108023d8008581bf91c5a3acc1859.patch"; + sha256 = "sha256-rRylz8cxgNyPSqL/THdgEBpzcVx1K+xbjUn4PwP9Jn4="; + }) + ]; + buildInputs = [ openssl ];