From dfe3b739c72b934f2be4ed78f191f6fda717f4cc Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Mon, 9 Aug 2021 21:59:56 +0200 Subject: [PATCH] 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. --- pkgs/games/0ad/wrapper.nix | 5 ++++- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/games/0ad/wrapper.nix b/pkgs/games/0ad/wrapper.nix index ede151307d5..3511dc0bed4 100644 --- a/pkgs/games/0ad/wrapper.nix +++ b/pkgs/games/0ad/wrapper.nix @@ -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 = []; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cf4e86402b8..f0b90b818ec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30009,9 +30009,9 @@ with pkgs; keen4 = callPackage ../games/keen4 { }; - zeroadPackages = dontRecurseIntoAttrs (callPackage ../games/0ad { + zeroadPackages = callPackage ../games/0ad { wxGTK = wxGTK31; - }); + }; zeroad = zeroadPackages.zeroad;