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

Merge pull request #133289 from chvp/zeroad-hydra-build

Browse Source 
zeroad: make sure hydra builds zeroad-unwrapped
This commit is contained in:
Sandro 2021-08-10 10:19:04 +02:00 committed by GitHub
commit 8a07b0d732
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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

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