JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

geda: pull upstream fixes for -fno-common toolchains

Browse Source 
Without the change builda fails on upstream gcc-10 as:

    ld: gattrib/src/../include/globals.h:97:
      multiple definition of `window'; gattrib/src/../include/globals.h:97: first defined here
This commit is contained in:
Sergei Trofimovich 2022-06-05 19:42:55 +01:00
parent 49c4223e98
commit 8b7b76a612
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/applications/science/electronics/geda/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkg-config, guile, gtk2, flex, gawk, perl }:
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, guile, gtk2, flex, gawk, perl }:
stdenv.mkDerivation {
pname = "geda";
@ -9,6 +9,20 @@ stdenv.mkDerivation {
sha256 = "08dpa506xk4gjbbi8vnxcb640wq4ihlgmhzlssl52nhvxwx7gx5v";
};
patches = [
# Pull upstream patch for -fno-common toolchains
(fetchpatch {
name = "fno-common-p1.patch";
url = "http://git.geda-project.org/geda-gaf/patch/?id=cb6bac898fe43c5a59b577123ba8698ec04deef6";
sha256 = "0njlh20qjrlqf5m8p92vmkl0jsm747f4mbqwvldnf8nd2j608nkq";
})
(fetchpatch {
name = "fno-common-p2.patch";
url = "http://git.geda-project.org/geda-gaf/patch/?id=7b9d523a3558290b4487c3ff9a4a5b43e8941158";
sha256 = "1z9gzz5ngsbq6c9dw2dfz7kpsq97zhs1ma9saxm7hiybwadbj18k";
})
];
configureFlags = [
"--disable-update-xdg-database"
];