BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

galculator: pull fix pending upstream inclusion for -fno-common toolchains

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

    ld: galculator-config_file.o:src/config_file.c:42:
      multiple definition of `prefs'; galculator-main.o:src/main.c:52: first defined here
This commit is contained in:
Sergei Trofimovich 2022-06-06 18:04:31 +01:00
parent ef75dae045
commit e2d15bd6fe
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/applications/misc/galculator/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub { lib, stdenv, fetchFromGitHub, fetchpatch
, autoreconfHook, intltool , autoreconfHook, intltool
, gtk, pkg-config, flex }: , gtk, pkg-config, flex }:
@ -13,6 +13,16 @@ stdenv.mkDerivation rec {
sha256 = "0q0hb62f266709ncyq96bpx4a40a1i6dc5869byvd7x285sx1c2w"; sha256 = "0q0hb62f266709ncyq96bpx4a40a1i6dc5869byvd7x285sx1c2w";
}; };
patches = [
# Pul patch pending upstream inclusion for -fno-common toolchain support:
# https://github.com/galculator/galculator/pull/45
(fetchpatch {
name = "fno-common.patch";
url = "https://github.com/galculator/galculator/commit/501a9e3feeb2e56889c0ff98ab6d0ab20348ccd6.patch";
sha256 = "08c9d2b49a1mizgk7v37dp8r96x389zc13mzv4dcy16x448lhp67";
})
];
nativeBuildInputs = [ autoreconfHook intltool pkg-config ]; nativeBuildInputs = [ autoreconfHook intltool pkg-config ];
buildInputs = [ gtk flex ]; buildInputs = [ gtk flex ];