pyrox.dev
galculator: pull fix pending upstream inclusion for -fno-common toolchains
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
+11
-1
pkgs/applications/misc/galculator/default.nix
+11
-1
pkgs/applications/misc/galculator/default.nix
···
1
-
{ lib, stdenv, fetchFromGitHub
1
+
{ lib, stdenv, fetchFromGitHub, fetchpatch
2
2
, autoreconfHook, intltool
3
3
, gtk, pkg-config, flex }:
4
4
···
12
12
rev = "v${version}";
13
13
sha256 = "0q0hb62f266709ncyq96bpx4a40a1i6dc5869byvd7x285sx1c2w";
14
14
};
15
+
16
+
patches = [
17
+
# Pul patch pending upstream inclusion for -fno-common toolchain support:
18
+
# https://github.com/galculator/galculator/pull/45
19
+
(fetchpatch {
20
+
name = "fno-common.patch";
21
+
url = "https://github.com/galculator/galculator/commit/501a9e3feeb2e56889c0ff98ab6d0ab20348ccd6.patch";
22
+
sha256 = "08c9d2b49a1mizgk7v37dp8r96x389zc13mzv4dcy16x448lhp67";
23
+
})
24
+
];
15
25
16
26
nativeBuildInputs = [ autoreconfHook intltool pkg-config ];
17
27
buildInputs = [ gtk flex ];