pyrox.dev
lol
flasm: pull patch pending upstream inclusion for -fno-common toolchains
Without the change build fails on upstream gcc-10 as:
ld: unflasm.o:/build/source/unflasm.c:32: multiple definition of
`swfVersion'; flasm.o:/build/source/flasm.c:36: first defined here
+11
-1
+11
-1
pkgs/development/compilers/flasm/default.nix
+11
-1
pkgs/development/compilers/flasm/default.nix
···
1
-
{ lib, stdenv, fetchzip, unzip, bison, flex, gperf, zlib }:
1
+
{ lib, stdenv, fetchzip, unzip, fetchpatch, bison, flex, gperf, zlib }:
2
2
3
3
stdenv.mkDerivation rec {
4
4
pname = "flasm";
···
9
9
sha256 = "03hvxm66rb6rjwbr07hc3k7ia5rim2xlhxbd9qmcai9xwmyiqafg";
10
10
stripRoot = false;
11
11
};
12
+
13
+
patches = [
14
+
# Pull patch pending upstream inclusion for -fno-common toolchains:
15
+
# https://sourceforge.net/p/flasm/patches/2/
16
+
(fetchpatch {
17
+
name = "fno-common.patch";
18
+
url = "https://sourceforge.net/p/flasm/patches/2/attachment/0001-flasm-fix-build-on-gcc-10-fno-common.patch";
19
+
sha256 = "0ic7k1mmyvhpnxam89dbg8i9bfzk70zslfdxgpmkszx097bj1hv6";
20
+
})
21
+
];
12
22
13
23
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
14
24