pyrox.dev
Merge pull request #176437 from trofi/fix-fno-common-for-geda
geda: pull upstream fixes for -fno-common toolchains
authored by Sergei Trofimovich and committed by GitHub 1c838684 bc2f96b1
+15
-1
pkgs/applications/science/electronics/geda/default.nix
+15
-1
pkgs/applications/science/electronics/geda/default.nix
···
1
-
{ lib, stdenv, fetchurl, pkg-config, guile, gtk2, flex, gawk, perl }:
1
+
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, guile, gtk2, flex, gawk, perl }:
2
2
3
3
stdenv.mkDerivation {
4
4
pname = "geda";
···
8
8
url = "http://ftp.geda-project.org/geda-gaf/stable/v1.8/1.8.2/geda-gaf-1.8.2.tar.gz";
9
9
sha256 = "08dpa506xk4gjbbi8vnxcb640wq4ihlgmhzlssl52nhvxwx7gx5v";
10
10
};
11
+
12
+
patches = [
13
+
# Pull upstream patch for -fno-common toolchains
14
+
(fetchpatch {
15
+
name = "fno-common-p1.patch";
16
+
url = "http://git.geda-project.org/geda-gaf/patch/?id=cb6bac898fe43c5a59b577123ba8698ec04deef6";
17
+
sha256 = "0njlh20qjrlqf5m8p92vmkl0jsm747f4mbqwvldnf8nd2j608nkq";
18
+
})
19
+
(fetchpatch {
20
+
name = "fno-common-p2.patch";
21
+
url = "http://git.geda-project.org/geda-gaf/patch/?id=7b9d523a3558290b4487c3ff9a4a5b43e8941158";
22
+
sha256 = "1z9gzz5ngsbq6c9dw2dfz7kpsq97zhs1ma9saxm7hiybwadbj18k";
23
+
})
24
+
];
11
25
12
26
configureFlags = [
13
27
"--disable-update-xdg-database"