nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 15:03:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

rocksndiamonds: pull upstream fix for -fno-common toolchains

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

    ld: libgame/libgame.a(system.o):src/libgame/system.c:41: multiple definition of
      `setup'; main.o:src/main.c:140: first defined here
This commit is contained in:
Sergei Trofimovich 2022-06-09 22:35:53 +01:00
parent a1ab20e9a2
commit ce5eca92f1
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/games/rocksndiamonds/default.nix
View File

@ -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";