From a0259207da8a9120fd14feecb52cdc984bb93ff2 Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.me>
Date: Fri, 8 Jan 2021 11:39:40 +0100
Subject: [PATCH 1/2] 0ad: fix build by using gcc9Stdenv

---
 pkgs/games/0ad/default.nix      | 10 +++++-----
 pkgs/top-level/all-packages.nix |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/games/0ad/default.nix b/pkgs/games/0ad/default.nix
index d53942766bb2..860db7c6d5ae 100644
--- a/pkgs/games/0ad/default.nix
+++ b/pkgs/games/0ad/default.nix
@@ -1,14 +1,14 @@
-{ wxGTK, newScope }:
-
+{ wxGTK, stdenv, newScope }:
 let
   callPackage = newScope self;
 
   self = {
-    zeroad-unwrapped = callPackage ./game.nix { inherit wxGTK; };
+    zeroad-unwrapped = callPackage ./game.nix { inherit wxGTK stdenv; };
 
-    zeroad-data = callPackage ./data.nix { };
+    zeroad-data = callPackage ./data.nix { inherit stdenv; };
 
     zeroad = callPackage ./wrapper.nix { };
   };
 
-in self
+in
+self
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eb7da0bfd079..83f7dc31397f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -27093,6 +27093,7 @@ in
 
   zeroadPackages = dontRecurseIntoAttrs (callPackage ../games/0ad {
     wxGTK = wxGTK30;
+    stdenv = gcc9Stdenv;
   });
 
   zeroad = zeroadPackages.zeroad;

From 2ce4aa86d976719749baa63e402af77b718bbb8d Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.me>
Date: Wed, 20 Jan 2021 17:42:39 +0100
Subject: [PATCH 2/2] 0ad: Do an extra s/pkgconfig/pkg-config to fix build

9bb3fcc missed one important rename of pkgconfig, breaking the build.
---
 pkgs/games/0ad/game.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix
index ae0b2180a80f..1ba975aa8854 100644
--- a/pkgs/games/0ad/game.nix
+++ b/pkgs/games/0ad/game.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
     # Workaround invalid pkg-config name for mozjs
     mkdir pkg-config
     ln -s ${spidermonkey_38}/lib/pkgconfig/* pkg-config/mozjs-38.pc
-    PKG_CONFIG_PATH="$PWD/pkgconfig:$PKG_CONFIG_PATH"
+    PKG_CONFIG_PATH="$PWD/pkg-config:$PKG_CONFIG_PATH"
 
     # Update Makefiles
     pushd build/workspaces