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

zeroad: make sure hydra builds zeroad-unwrapped

Browse Source 
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.
This commit is contained in:
Charlotte Van Petegem 2021-08-09 21:59:56 +02:00 committed by Charlotte Van Petegem
parent 7b554c9477
commit dfe3b739c7
No known key found for this signature in database
GPG Key ID: 019E764B7184435A
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/games/0ad/wrapper.nix
View File

@ -4,7 +4,6 @@ assert zeroad-unwrapped.version == zeroad-data.version;
buildEnv {
name = "zeroad-${zeroad-unwrapped.version}";
inherit (zeroad-unwrapped) meta;
nativeBuildInputs = [ makeWrapper ];
@ -18,4 +17,8 @@ buildEnv {
--set ZEROAD_ROOTDIR "$out/share/0ad"
done
'';
meta = zeroad-unwrapped.meta // {
hydraPlatforms = [];
};
}

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

@ -30009,9 +30009,9 @@ with pkgs;
keen4 = callPackage ../games/keen4 { };
zeroadPackages = dontRecurseIntoAttrs (callPackage ../games/0ad {
zeroadPackages = callPackage ../games/0ad {
wxGTK = wxGTK31;
});
};
zeroad = zeroadPackages.zeroad;