Merge pull request #240338 from chvp/fix/zeroad

zeroad: fix build by using fmt_9
This commit is contained in:
Mario Rodas 2023-06-29 08:26:50 -05:00 committed by GitHub
commit 6103a665f4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions

View file

@ -1,9 +1,9 @@
{ wxGTK, stdenv, newScope }: { fmt, wxGTK, stdenv, newScope }:
let let
callPackage = newScope self; callPackage = newScope self;
self = { self = {
zeroad-unwrapped = callPackage ./game.nix { inherit wxGTK stdenv; }; zeroad-unwrapped = callPackage ./game.nix { inherit fmt wxGTK stdenv; };
zeroad-data = callPackage ./data.nix { inherit stdenv; }; zeroad-data = callPackage ./data.nix { inherit stdenv; };

View file

@ -37788,6 +37788,7 @@ with pkgs;
zeroadPackages = recurseIntoAttrs (callPackage ../games/0ad { zeroadPackages = recurseIntoAttrs (callPackage ../games/0ad {
wxGTK = wxGTK32; wxGTK = wxGTK32;
fmt = fmt_9;
}); });
zeroad = zeroadPackages.zeroad; zeroad = zeroadPackages.zeroad;