Merge pull request #133289 from chvp/zeroad-hydra-build
zeroad: make sure hydra builds zeroad-unwrapped
commit8a07b0d7326945ec0612fb0cacfa9ba04bf5f6ef
authorSandro <sandro.jaeckel@gmail.com>
dateTue 10 Aug 2021, 10:19 (5 years ago)
parent70b69cddfe3b73
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
@@ -30018,9 +30018,9 @@ with pkgs;
3001830018
3001930019 keen4 = callPackage ../games/keen4 { };
3002030020
30021− zeroadPackages = dontRecurseIntoAttrs (callPackage ../games/0ad {
30021+ zeroadPackages = callPackage ../games/0ad {
3002230022 wxGTK = wxGTK31;
30023− });
30023+ };
3002430024
3002530025 zeroad = zeroadPackages.zeroad;
3002630026