From 944ed09de6050dc4b7e6e7878acc39a1b313bae9 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Thu, 9 Jun 2022 08:52:00 +0100
Subject: [PATCH] alarm-clock-applet: pull fix pending upstream inclusion for
 -fno-common toolchains

Without the change build fails on upstream gcc-10 as:

    ld: prefs.o:src/alarm-applet.h:49: multiple definition of
       `app_command_map'; alarm-applet.o:src/alarm-applet.h:49: first defined here
---
 pkgs/tools/misc/alarm-clock-applet/default.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/alarm-clock-applet/default.nix b/pkgs/tools/misc/alarm-clock-applet/default.nix
index 5585b6901dce..7bf58bb2ff39 100644
--- a/pkgs/tools/misc/alarm-clock-applet/default.nix
+++ b/pkgs/tools/misc/alarm-clock-applet/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub, fetchpatch
 , pkg-config
 , autoconf
 , automake111x
@@ -28,6 +28,16 @@ stdenv.mkDerivation rec {
     sha256 = "18blvgy8hmw3jidz7xrv9yiiilnzcj65m6wxhw58nrnbcqbpydwn";
   };
 
+  patches = [
+    # Pull patch pending upstream inclusion for -fno-common toolchain support:
+    #   https://github.com/joh/alarm-clock/pull/209
+    (fetchpatch {
+      name = "fno-common.patch";
+      url = "https://github.com/joh/alarm-clock/commit/969e7ba8225610cce55b14fcb599bc6f7771bd9a.patch";
+      sha256 = "0ajhir22b5ww9pkmzy9mlc9f2lr1q6wgvm9iqzjf4xsg4gm4jy1k";
+    })
+  ];
+
   nativeBuildInputs = [
     pkg-config
     intltool