b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gpredict: pull upstream fix for -fno-common toolchains

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

    ld: save-pass.o:src/qth-data.h:36: multiple definition of
       `qth_data_type'; gtk-azel-plot.o:src/qth-data.h:36: first defined here
This commit is contained in:
Sergei Trofimovich 2022-06-08 09:03:34 +01:00
parent c26e525b41
commit 2f9d125d58
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/science/astronomy/gpredict/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkg-config, intltool
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, intltool
, gtk3, glib, curl, goocanvas2, gpsd
, hamlib, wrapGAppsHook
}:
@ -14,6 +14,16 @@ in stdenv.mkDerivation {
sha256 = "0hwf97kng1zy8rxyglw04x89p0bg07zq30hgghm20yxiw2xc8ng7";
};
patches = [
# Pull upstream fix for -fno-common toolchains:
# https://github.com/csete/gpredict/issues/195
(fetchpatch {
name = "fno-common.patch";
url = "https://github.com/csete/gpredict/commit/c565bb3d48777bfe17114b5d01cd81150521f056.patch";
sha256 = "1jhy9hpqlachq32bkij60q3dxkgi1kkr80rm29jjxqpmambf406a";
})
];
nativeBuildInputs = [ pkg-config intltool wrapGAppsHook ];
buildInputs = [ curl glib gtk3 goocanvas2 gpsd hamlib ];