alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

alarm-clock-applet: pull fix pending upstream inclusion for -fno-common toolchains

Browse source 
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
This commit is contained in:
Sergei Trofimovich 2022-06-09 08:52:00 +01:00
parent 438687abb8
commit 944ed09de6
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/tools/misc/alarm-clock-applet/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub { lib, stdenv, fetchFromGitHub, fetchpatch
, pkg-config , pkg-config
, autoconf , autoconf
, automake111x , automake111x
@ -28,6 +28,16 @@ stdenv.mkDerivation rec {
sha256 = "18blvgy8hmw3jidz7xrv9yiiilnzcj65m6wxhw58nrnbcqbpydwn"; 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 = [ nativeBuildInputs = [
pkg-config pkg-config
intltool intltool