about summary refs log tree commit diff
path: root/pkgs/games
diff options
context:
space:
mode:
authorSergei Trofimovich <slyich@gmail.com>2022-06-13 21:59:55 +0000
committerGitHub <noreply@github.com>2022-06-13 21:59:55 +0000
commitddc5ceb9295aa0e530d950a625b63663c8b75a7f (patch)
tree199184a8f139ec5dfa65c5d065e3cfe5a0170ce1 /pkgs/games
parent480fe8eeceedd92eb9a7c149e86a4844bcdc6d65 (diff)
parent1ee09a25e808abf4d8d65f3900ba6aef2cd028b6 (diff)
Merge pull request #177094 from trofi/fix-fno-common-for-neverball
neverball: pull upstream fix for -fno-common toolchains
Diffstat (limited to 'pkgs/games')
-rw-r--r--pkgs/games/neverball/default.nix13
1 files changed, 11 insertions, 2 deletions
diff --git a/pkgs/games/neverball/default.nix b/pkgs/games/neverball/default.nix
index ba1d403207a98..5e8e3f41c784f 100644
--- a/pkgs/games/neverball/default.nix
+++ b/pkgs/games/neverball/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, SDL2, libGL, libpng, libjpeg, SDL2_ttf, libvorbis, gettext
+{ lib, stdenv, fetchurl, fetchpatch, SDL2, libGL, libpng, libjpeg, SDL2_ttf, libvorbis, gettext
 , physfs }:
 
 stdenv.mkDerivation rec {
@@ -8,12 +8,21 @@ stdenv.mkDerivation rec {
     url = "https://neverball.org/neverball-${version}.tar.gz";
     sha256 = "184gm36c6p6vaa6gwrfzmfh86klhnb03pl40ahsjsvprlk667zkk";
   };
+  patches = [
+    # Pull upstream fix for -fno-common toolchains
+    #   https://github.com/Neverball/neverball/pull/198
+    (fetchpatch {
+      name = "fno-common.patch";
+      url = "https://github.com/Neverball/neverball/commit/a42492b8db06934c7a794630db92e3ff6ebaadaa.patch";
+      sha256 = "0sqyxfwpl4xxra8iz87j5rxzwani16xra2xl4l5z61shvq30308h";
+    })
+  ];
 
   buildInputs = [ libpng SDL2 libGL libjpeg SDL2_ttf libvorbis gettext physfs ];
 
   dontPatchELF = true;
 
-  patchPhase = ''
+  postPatch = ''
     sed -i -e 's@\./data@'$out/share/neverball/data@ share/base_config.h Makefile
     sed -i -e 's@\./locale@'$out/share/neverball/locale@ share/base_config.h Makefile
     sed -i -e 's@-lvorbisfile@-lvorbisfile -lX11 -lgcc_s@' Makefile