MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 07:13:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

mupen64plus: pull upstream fix for -fno-common toolchains

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

    ld: _obj/device/r4300/x86_64/dynarec.o (symbol from plugin): in function `dyna_jump': (.text+0x0):
      multiple definition of `g_r4300_opcodes'; _obj/device/r4300/cached_interp.o (symbol from plugin):(.text+0x0): first defined here
This commit is contained in:
Sergei Trofimovich 2022-05-22 15:18:43 +01:00
parent e04ca59317
commit 1e42f67d82
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pkgs/applications/emulators/mupen64plus/default.nix
View file

@ -1,4 +1,4 @@
{lib, stdenv, fetchurl, boost, dash, freetype, libpng, pkg-config, SDL, which, zlib, nasm }:
{lib, stdenv, fetchurl, fetchpatch, boost, dash, freetype, libpng, pkg-config, SDL, which, zlib, nasm }:
stdenv.mkDerivation rec {
pname = "mupen64plus";
@ -9,6 +9,19 @@ stdenv.mkDerivation rec {
sha256 = "1a21n4gqdvag6krwcjm5bnyw5phrlxw6m0mk73jy53iq03f3s96m";
};
patches = [
# Pull upstream fix for -fno-common toolchains:
# https://github.com/mupen64plus/mupen64plus-core/pull/736
(fetchpatch {
name = "fno-common.patch";
url = "https://github.com/mupen64plus/mupen64plus-core/commit/39975200ad4926cfc79c96609b64696289065502.patch";
sha256 = "0kdshp9xdkharn3d1g1pvxhh761pa1v5w07iq0wf9l380r2m6gbv";
# a/something -> a/source/mupen64plus-core/something
stripLen = 1;
extraPrefix = "source/mupen64plus-core/";
})
];
nativeBuildInputs = [ pkg-config nasm ];
buildInputs = [ boost dash freetype libpng SDL which zlib ];