JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pcsxr: add -fcommon workaround

Browse Source 
Workaround build failure on -fno-common toolchains like upstream
gcc-10. Otherwise build fails as:

    ld: AboutDlg.o:/build/pcsxr/gui/Linux.h:42: multiple definition of `cfgfile';
      LnxMain.o:/build/pcsxr/gui/Linux.h:42: first defined here
This commit is contained in:
Sergei Trofimovich 2022-05-22 20:35:39 +01:00
parent e04ca59317
commit 1572de8d20
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/emulators/pcsxr/default.nix
View File

@ -56,6 +56,12 @@ stdenv.mkDerivation rec {
xorg.libXxf86vm
];
# Workaround build failure on -fno-common toolchains like upstream
# gcc-10. Otherwise build fails as:
# ld: AboutDlg.o:/build/pcsxr/gui/Linux.h:42: multiple definition of `cfgfile';
# LnxMain.o:/build/pcsxr/gui/Linux.h:42: first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
dynarecTarget =
if stdenv.isx86_64 then "x86_64"
else if stdenv.isi686 then "x86"
@ -81,7 +87,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Playstation 1 emulator";
homepage = "https://pcsxr.codeplex.com/";
homepage = "https://github.com/iCatButler/pcsxr";
maintainers = with maintainers; [ rardiol ];
license = licenses.gpl2Plus;
platforms = platforms.all;