pyrox.dev
Merge pull request #176264 from trofi/fix-fno-common-for-gcolor2
gcolor2: pull patch pending upstream inclusion for -fno-common toolch…
authored by
Sergei Trofimovich
and committed by
GitHub
41642735
ef103337
+12
-3
pkgs/applications/graphics/gcolor2/default.nix
+12
-3
pkgs/applications/graphics/gcolor2/default.nix
···
1
-
{lib, stdenv, fetchurl, gtk2, perlPackages, pkg-config } :
1
+
{lib, stdenv, fetchurl, fetchpatch, gtk2, perlPackages, pkg-config } :
2
2
3
3
let version = "0.4"; in
4
4
stdenv.mkDerivation {
···
16
16
'';
17
17
18
18
# from https://github.com/PhantomX/slackbuilds/tree/master/gcolor2/patches
19
-
patches = if stdenv.hostPlatform.system == "x86_64-linux" then
19
+
patches = (if stdenv.hostPlatform.system == "x86_64-linux" then
20
20
[ ./gcolor2-amd64.patch ] else
21
-
[ ];
21
+
[ ])
22
+
++ [
23
+
# Pull patch pending upstream inclusion for -fno-common toolchains:
24
+
# https://sourceforge.net/p/gcolor2/patches/8/
25
+
(fetchpatch {
26
+
name = "fno-common.patch";
27
+
url = "https://sourceforge.net/p/gcolor2/patches/8/attachment/0001-gcolor2-fix-build-on-gcc-10-fno-common.patch";
28
+
sha256 = "0187zc8as9g3d6mpm3isg87jfpryj0hajb4inwvii8gxrzbi5l5f";
29
+
})
30
+
];
22
31
23
32
nativeBuildInputs = [ pkg-config ];
24
33
buildInputs = [ gtk2 ]