swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 12:29:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #174037 from trofi/workaround-fno-common-for-pcsxr

Browse source 
pcsxr: add -fcommon workaround
This commit is contained in:
Sandro 2022-05-25 00:32:00 +02:00 committed by GitHub
parent 4c0b6a5a4e 1572de8d20
commit b732baf859
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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;