public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

0ad: fix build by using gcc9Stdenv

Browse Source
This commit is contained in:
Charlotte Van Petegem 2021-01-08 11:39:40 +01:00
parent ac2752362c
commit a0259207da
No known key found for this signature in database
GPG Key ID: 019E764B7184435A
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/games/0ad/default.nix
View File

@ -1,14 +1,14 @@
{ wxGTK, newScope }: { wxGTK, stdenv, newScope }:
let let
callPackage = newScope self; callPackage = newScope self;
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 { }; zeroad = callPackage ./wrapper.nix { };
}; };
in self in
self

1
pkgs/top-level/all-packages.nix
View File

@ -27093,6 +27093,7 @@ in
zeroadPackages = dontRecurseIntoAttrs (callPackage ../games/0ad { zeroadPackages = dontRecurseIntoAttrs (callPackage ../games/0ad {
wxGTK = wxGTK30; wxGTK = wxGTK30;
stdenv = gcc9Stdenv;
}); });
zeroad = zeroadPackages.zeroad; zeroad = zeroadPackages.zeroad;