mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-10-01 09:30:20 +02:00
Merge pull request #176266 from trofi/workaround-fno-common-for-gtklp
gtklp: add -fcommon workaround
This commit is contained in:
commit
bc411d92de
|
@ -31,6 +31,11 @@ stdenv.mkDerivation rec {
|
||||||
./patches/autoconf.patch
|
./patches/autoconf.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
|
# Workaround build failure on -fno-common toolchains:
|
||||||
|
# ld: libgtklp.a(libgtklp.o):libgtklp/libgtklp.h:83: multiple definition of `progressBar';
|
||||||
|
# file.o:libgtklp/libgtklp.h:83: first defined here
|
||||||
|
NIX_CFLAGS_COMPILE = "-fcommon";
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
substituteInPlace include/defaults.h --replace "netscape" "firefox"
|
substituteInPlace include/defaults.h --replace "netscape" "firefox"
|
||||||
substituteInPlace include/defaults.h --replace "http://localhost:631/sum.html#STANDARD_OPTIONS" \
|
substituteInPlace include/defaults.h --replace "http://localhost:631/sum.html#STANDARD_OPTIONS" \
|
||||||
|
|
Loading…
Reference in a new issue