zeroad: make sure hydra builds zeroad-unwrapped
Hydra hasn't built zeroad since the 0.0.24 bump:
https://hydra.nixos.org/job/nixos/trunk-combined/nixpkgs.zeroad.x86_64-linux/all
This is due to the data package becoming larger than the output
limit. Even though the data package is already marked with
`hydraPlatforms = [];`, hydra still tried to build it, since it is a
dependency of `zeroad`. This makes it so `zeroad` isn't built by hydra
either. Only `zeroad-unwrapped` (which takes significant compilation
time) will be built by hydra.
commitdfe3b739c72b934f2be4ed78f191f6fda717f4cc
authorCharlotte Van Petegem <charlotte.vanpetegem@ugent.be>
dateMon 9 Aug 2021, 21:59 (5 years ago)
parent7b554c9
pkgs/games/0ad/wrapper.nix+4−1
@@ -4,7 +4,6 @@ assert zeroad-unwrapped.version == zeroad-data.version;
44
55buildEnv {
66 name = "zeroad-${zeroad-unwrapped.version}";
7− inherit (zeroad-unwrapped) meta;
87
98 nativeBuildInputs = [ makeWrapper ];
109
@@ -18,4 +17,8 @@ buildEnv {
1817 --set ZEROAD_ROOTDIR "$out/share/0ad"
1918 done
2019 '';
20+
21+ meta = zeroad-unwrapped.meta // {
22+ hydraPlatforms = [];
23+ };
2124}
pkgs/top-level/all-packages.nix+2−2
@@ -30009,9 +30009,9 @@ with pkgs;
3000930009
3001030010 keen4 = callPackage ../games/keen4 { };
3001130011
30012− zeroadPackages = dontRecurseIntoAttrs (callPackage ../games/0ad {
30012+ zeroadPackages = callPackage ../games/0ad {
3001330013 wxGTK = wxGTK31;
30014− });
30014+ };
3001530015
3001630016 zeroad = zeroadPackages.zeroad;
3001730017