diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2022-06-13 16:59:14 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-13 16:59:14 +0000 |
| commit | 3c1e24d599b97d4bbe319f3b2c90c3352c6d0091 (patch) | |
| tree | 4e4206182b3d01034b04d846c734f63dae007b21 /pkgs/games | |
| parent | 13f08d71ceff5101321e0291854495a1ec153a5e (diff) | |
| parent | ce5eca92f157e9f4fc7c2f5566fc2f8beff14d0a (diff) | |
Merge pull request #177095 from trofi/fix-fno-common-for-rocksndiamonds
rocksndiamonds: pull upstream fix for -fno-common toolchains
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/rocksndiamonds/default.nix | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/pkgs/games/rocksndiamonds/default.nix b/pkgs/games/rocksndiamonds/default.nix index b01d616452bbb..39df9615154c7 100644 --- a/pkgs/games/rocksndiamonds/default.nix +++ b/pkgs/games/rocksndiamonds/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeDesktopItem, SDL2, SDL2_image, SDL2_mixer, SDL2_net }: +{ lib, stdenv, fetchurl, fetchpatch, makeDesktopItem, SDL2, SDL2_image, SDL2_mixer, SDL2_net }: stdenv.mkDerivation rec { pname = "rocksndiamonds"; @@ -9,6 +9,20 @@ stdenv.mkDerivation rec { sha256 = "1k0m6l5g886d9mwwh6q0gw75qsb85mpf8i0rglh047app56nsk72"; }; + patches = [ + # Pull upstream fix for -fno-common toolchain. + (fetchpatch { + name = "fno-common-p1.patch"; + url = "https://git.artsoft.org/?p=rocksndiamonds.git;a=patch;h=b4271393b10b7c664a58f3db7349a3875c1676fe"; + sha256 = "0bdy4d2ril917radmm0c2yh2gqfyh7q1c8kahig5xknn2rkf2iac"; + }) + (fetchpatch { + name = "fno-common-p2.patch"; + url = "https://git.artsoft.org/?p=rocksndiamonds.git;a=patch;h=81dbde8a570a94dd2e938eff2f52dc5a3ecced21"; + sha256 = "1mk5yb8pxrpxvvsxw3pjcbgx2c658baq9vmqqipbj5byhkkw7v2l"; + }) + ]; + desktopItem = makeDesktopItem { name = "rocksndiamonds"; exec = "rocksndiamonds"; |