diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2022-06-17 20:44:56 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-17 20:44:56 +0000 |
| commit | 0e2797784d60afb7b682a9126b9a9fce97fd4a9f (patch) | |
| tree | 42158e5b78eed78958ccb7048912789642ee2134 /pkgs/games | |
| parent | 36e999c3c7a134c10e9914fe8d834dd7d4b9fabb (diff) | |
| parent | 27d3d3bb04718ba356e758a4329774f1df237594 (diff) | |
Merge pull request #176938 from trofi/fix-fno-common-for-megaglest
megaglest: pull upstream fix for -fno-common toolchains
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/megaglest/default.nix | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/games/megaglest/default.nix b/pkgs/games/megaglest/default.nix index 30383e5f4067e..6a21a74f70b4a 100644 --- a/pkgs/games/megaglest/default.nix +++ b/pkgs/games/megaglest/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, cmake, pkg-config, git, curl, SDL2, xercesc, openal, lua, libvlc , libjpeg, wxGTK, cppunit, ftgl, glew, libogg, libvorbis, buildEnv, libpng , fontconfig, freetype, xorg, makeWrapper, bash, which, gnome, libGLU, glib -, fetchFromGitHub +, fetchFromGitHub, fetchpatch }: let version = "3.13.0"; @@ -28,6 +28,15 @@ stdenv.mkDerivation { sha256 = "0fb58a706nic14ss89zrigphvdiwy5s9dwvhscvvgrfvjpahpcws"; }; + patches = [ + # Pull upstream fix for -fno-common toolchains + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/MegaGlest/megaglest-source/commit/5a3520540276a6fd06f7c88e571b6462978e3eab.patch"; + sha256 = "0y554kjw56dikq87vs709pmq97hdx9hvqsk27f81v4g90m3b3qhi"; + }) + ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ git curl SDL2 xercesc openal lua libpng libjpeg libvlc wxGTK glib cppunit fontconfig freetype ftgl glew libogg libvorbis makeWrapper libGLU ]; |