diff --git a/pkgs/applications/emulators/mupen64plus/default.nix b/pkgs/applications/emulators/mupen64plus/default.nix index f5d17d9d3951..82908a166d46 100644 --- a/pkgs/applications/emulators/mupen64plus/default.nix +++ b/pkgs/applications/emulators/mupen64plus/default.nix @@ -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 ];