alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

uqm: Fix build against glibc 2.26

Browse source 
I've bisected the introduction of the build failure to be the glibc 2.26
upgrade with commit 9bb67d5c1e.

At first I was somewhat stumped why an glibc update could cause
undeclared identifiers, but after looking at the changes of glibc and
the source code of The Ur-Quan Masters the problem quickly turned out to
be this very change:

https://sourceware.org/git/?p=glibc.git;a=commit;h=7b037c095e31c2396d0a9b0e6356bc566ee4812f

So string.h now in turn includes strings.h, which in theory wouldn't be
a problem.

However, both strings.h and the strings.h in the uqm source code use
constant _STRINGS_H, which causes the glibc strings.h to be included but
the one from uqm basically includes an empty file.

Signed-off-by: aszlig <aszlig@nix.build>
This commit is contained in:
aszlig 2017-11-08 06:33:21 +01:00
parent 3429d8cbbf
commit 7603da33de
No known key found for this signature in database
GPG key ID: 684089CE67EBB691
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/games/uqm/default.nix
View file

@ -70,6 +70,11 @@ in stdenv.mkDerivation rec {
ln -s "${videos}" "uqm-${version}/content/addons/3dovideo" ln -s "${videos}" "uqm-${version}/content/addons/3dovideo"
''; '';
# Using _STRINGS_H as include guard conflicts with glibc.
postPatch = ''
sed -i -e '/^#/s/_STRINGS_H/_UQM_STRINGS_H/g' src/uqm/comm/*/strings.h
'';
# uqm has a 'unique' build system with a root script incidentally called # uqm has a 'unique' build system with a root script incidentally called
# 'build.sh'. # 'build.sh'.
configurePhase = '' configurePhase = ''