about summary refs log tree commit diff
path: root/pkgs/applications/radio/dmrconfig
diff options
context:
space:
mode:
authorSergei Trofimovich <slyich@gmail.com>2022-05-20 08:44:24 +0100
committerSergei Trofimovich <slyich@gmail.com>2022-05-20 08:44:24 +0100
commit84467ab40fda190c18703bdaf2f32994a1da7f5e (patch)
tree7d4b9773a20b4f616c016bc27ae5e84969460287 /pkgs/applications/radio/dmrconfig
parent2d584efc0602d16541dab796379ba1952304ef4e (diff)
dmrconfig: pull upstram fix for -fno-common toolchains
Without the change build failure on upxtream gcc-10 as:

    ld: hid-libusb.o:/build/source/util.h:38: multiple definition of
      `trace_flag'; main.o:/build/source/util.h:38: first defined here
Diffstat (limited to 'pkgs/applications/radio/dmrconfig')
-rw-r--r--pkgs/applications/radio/dmrconfig/default.nix11
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/applications/radio/dmrconfig/default.nix b/pkgs/applications/radio/dmrconfig/default.nix
index 4bf523a8b8b38..b91e9bc63a517 100644
--- a/pkgs/applications/radio/dmrconfig/default.nix
+++ b/pkgs/applications/radio/dmrconfig/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub, fetchpatch
 , libusb1, systemd }:
 
 stdenv.mkDerivation rec {
@@ -12,6 +12,15 @@ stdenv.mkDerivation rec {
     sha256 = "1qwix75z749628w583fwp7m7kxbj0k3g159sxb7vgqxbadqqz1ab";
   };
 
+  patches = [
+    # Pull upstream fix for -fno-common toolchains.
+    (fetchpatch {
+      name = "fno-common.patch";
+      url = "https://github.com/OpenRTX/dmrconfig/commit/1a6901488db26262a6b69f80b0e795864e9e8d0a.patch";
+      sha256 = "03px1y95a8aspd251i1jj8ggqfjvkqby4lhn5pb7l5c1lzh6h762";
+    })
+  ];
+
   buildInputs = [
     libusb1 systemd
   ];