b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

neverball: pull upstream fix for -fno-common toolchains

Browse source 
Without the change build fails on upstream gcc-10 as:

    ld: ball/st_save.o:(.bss+0x0): multiple definition of
      `text_input'; share/text.o:(.bss+0x0): first defined here
This commit is contained in:
Sergei Trofimovich 2022-06-09 22:22:21 +01:00
parent fdf46783c7
commit 1ee09a25e8
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/games/neverball/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, SDL2, libGL, libpng, libjpeg, SDL2_ttf, libvorbis, gettext
{ lib, stdenv, fetchurl, fetchpatch, SDL2, libGL, libpng, libjpeg, SDL2_ttf, libvorbis, gettext
, physfs }:
stdenv.mkDerivation rec {
@ -8,12 +8,21 @@ stdenv.mkDerivation rec {
url = "https://neverball.org/neverball-${version}.tar.gz";
sha256 = "184gm36c6p6vaa6gwrfzmfh86klhnb03pl40ahsjsvprlk667zkk";
};
patches = [
# Pull upstream fix for -fno-common toolchains
# https://github.com/Neverball/neverball/pull/198
(fetchpatch {
name = "fno-common.patch";
url = "https://github.com/Neverball/neverball/commit/a42492b8db06934c7a794630db92e3ff6ebaadaa.patch";
sha256 = "0sqyxfwpl4xxra8iz87j5rxzwani16xra2xl4l5z61shvq30308h";
})
];
buildInputs = [ libpng SDL2 libGL libjpeg SDL2_ttf libvorbis gettext physfs ];
dontPatchELF = true;
patchPhase = ''
postPatch = ''
sed -i -e 's@\./data@'$out/share/neverball/data@ share/base_config.h Makefile
sed -i -e 's@\./locale@'$out/share/neverball/locale@ share/base_config.h Makefile
sed -i -e 's@-lvorbisfile@-lvorbisfile -lX11 -lgcc_s@' Makefile