From a0259207da8a9120fd14feecb52cdc984bb93ff2 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Fri, 8 Jan 2021 11:39:40 +0100 Subject: [PATCH] 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 d53942766bb..860db7c6d5a 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 eb7da0bfd07..83f7dc31397 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;