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.
This commit is contained in:
parent
7b554c9477
commit
dfe3b739c7
|
@ -4,7 +4,6 @@ assert zeroad-unwrapped.version == zeroad-data.version;
|
||||||
|
|
||||||
buildEnv {
|
buildEnv {
|
||||||
name = "zeroad-${zeroad-unwrapped.version}";
|
name = "zeroad-${zeroad-unwrapped.version}";
|
||||||
inherit (zeroad-unwrapped) meta;
|
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
|
|
||||||
|
@ -18,4 +17,8 @@ buildEnv {
|
||||||
--set ZEROAD_ROOTDIR "$out/share/0ad"
|
--set ZEROAD_ROOTDIR "$out/share/0ad"
|
||||||
done
|
done
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
meta = zeroad-unwrapped.meta // {
|
||||||
|
hydraPlatforms = [];
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -30009,9 +30009,9 @@ with pkgs;
|
||||||
|
|
||||||
keen4 = callPackage ../games/keen4 { };
|
keen4 = callPackage ../games/keen4 { };
|
||||||
|
|
||||||
zeroadPackages = dontRecurseIntoAttrs (callPackage ../games/0ad {
|
zeroadPackages = callPackage ../games/0ad {
|
||||||
wxGTK = wxGTK31;
|
wxGTK = wxGTK31;
|
||||||
});
|
};
|
||||||
|
|
||||||
zeroad = zeroadPackages.zeroad;
|
zeroad = zeroadPackages.zeroad;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue