cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

decoder: pull patch pending upstream inclusion for -fno-common toolchains

Browse source 
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
This commit is contained in:
Sergei Trofimovich 2022-07-09 08:18:37 +01:00
parent 95e157f670
commit b55d83f112
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/tools/security/decoder/default.nix
View file

@ -1,6 +1,7 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, openssl , openssl
}: }:
@ -15,6 +16,16 @@ stdenv.mkDerivation rec {
sha256 = "sha256-1sT1/iwtc2ievmLuNuooy9b14pTs1ZC5noDwzFelk7w="; 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 = [ buildInputs = [
openssl openssl
]; ];