diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2022-06-09 17:11:58 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-09 17:11:58 +0000 |
| commit | 5770bec753f445616b0d14b513c592f263c0c8f5 (patch) | |
| tree | e2dc0c5dff86f1f1c752f8497076240ebd150bf4 | |
| parent | 53ee7c487992d315d1b1715dada684520a247191 (diff) | |
| parent | 944ed09de6050dc4b7e6e7878acc39a1b313bae9 (diff) | |
Merge pull request #177000 from trofi/fix-fno-common-for-alarm-clock-applet
alarm-clock-applet: pull fix pending upstream inclusion for -fno-comm…
| -rw-r--r-- | pkgs/tools/misc/alarm-clock-applet/default.nix | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/tools/misc/alarm-clock-applet/default.nix b/pkgs/tools/misc/alarm-clock-applet/default.nix index 5585b6901dce5..7bf58bb2ff399 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 |