From 5e8e5553ad721c93b415e5c62d3780bb969f2a85 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 22 May 2022 18:24:17 +0100 Subject: [PATCH] opencorsairlink: pull upstream fix for -fno-common toolchains Without the change build fails on upstream gcc-10: ld: logic/settings/psu.o:/build/source/include/logic/scan.h:30: multiple definition of `scanlist'; main.o:/build/source/include/logic/scan.h:30: first defined here --- pkgs/tools/misc/opencorsairlink/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/opencorsairlink/default.nix b/pkgs/tools/misc/opencorsairlink/default.nix index 1c18cb82c590..ed11232065e9 100644 --- a/pkgs/tools/misc/opencorsairlink/default.nix +++ b/pkgs/tools/misc/opencorsairlink/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libusb1, pkg-config }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, libusb1, pkg-config }: stdenv.mkDerivation rec { pname = "OpenCorsairLink"; @@ -16,6 +16,15 @@ stdenv.mkDerivation rec { sha256 = "1nizicl0mc9pslc6065mnrs0fnn8sh7ca8iiw7w9ix57zrhabpld"; }; + patches = [ + # Pull upstream fix for -fno-common toolchain + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/audiohacked/OpenCorsairLink/commit/d600c7ff032a3911d30b039844a31f0b3acfe26a.patch"; + sha256 = "030rwka5bvf79x6ir18vqb09izhz1crp94x5gqjxwv3b20vvv4kx"; + }) + ]; + meta = with lib; { description = "Linux and Mac OS support for the CorsairLink Devices "; homepage = "https://github.com/audiohacked/OpenCorsairLink";