Merge pull request #133289 from chvp/zeroad-hydra-build
zeroad: make sure hydra builds zeroad-unwrapped
This commit is contained in:
commit
8a07b0d732
|
@ -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 = [];
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -30018,9 +30018,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 New Issue