diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2022-05-25 00:32:00 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-25 00:32:00 +0200 |
commit | b732baf859996d37db16d9c632a6f30605f5bfa4 (patch) | |
tree | 22236823f97494e79b9f750a69499ccf29a1a0bb /pkgs/applications | |
parent | 4c0b6a5a4e064ae0117a7697a0d16029593ae560 (diff) | |
parent | 1572de8d203cbddeab81e4f005db55eb81276693 (diff) | |
download | nixpkgs-b732baf859996d37db16d9c632a6f30605f5bfa4.tar nixpkgs-b732baf859996d37db16d9c632a6f30605f5bfa4.tar.gz nixpkgs-b732baf859996d37db16d9c632a6f30605f5bfa4.tar.bz2 nixpkgs-b732baf859996d37db16d9c632a6f30605f5bfa4.tar.lz nixpkgs-b732baf859996d37db16d9c632a6f30605f5bfa4.tar.xz nixpkgs-b732baf859996d37db16d9c632a6f30605f5bfa4.tar.zst nixpkgs-b732baf859996d37db16d9c632a6f30605f5bfa4.zip |
Merge pull request #174037 from trofi/workaround-fno-common-for-pcsxr
pcsxr: add -fcommon workaround
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/emulators/pcsxr/default.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/applications/emulators/pcsxr/default.nix b/pkgs/applications/emulators/pcsxr/default.nix index e3126efe82d..2c178dc72f5 100644 --- a/pkgs/applications/emulators/pcsxr/default.nix +++ b/pkgs/applications/emulators/pcsxr/default.nix @@ -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; |