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

Merge pull request #108761 from charvp/fix/zeroad-build

Browse Source
This commit is contained in:
Sandro 2021-01-20 20:14:01 +01:00 committed by GitHub
commit 8008ebae20
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/games/0ad/default.nix
View File

@ -1,14 +1,14 @@
{ wxGTK, newScope }:
{ wxGTK, stdenv, newScope }:
let
callPackage = newScope self;
self = {
zeroad-unwrapped = callPackage ./game.nix { inherit wxGTK; };
zeroad-unwrapped = callPackage ./game.nix { inherit wxGTK stdenv; };
zeroad-data = callPackage ./data.nix { };
zeroad-data = callPackage ./data.nix { inherit stdenv; };
zeroad = callPackage ./wrapper.nix { };
};
in self
in
self

2
pkgs/games/0ad/game.nix
View File

@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
# Workaround invalid pkg-config name for mozjs
mkdir pkg-config
ln -s ${spidermonkey_38}/lib/pkgconfig/* pkg-config/mozjs-38.pc
PKG_CONFIG_PATH="$PWD/pkgconfig:$PKG_CONFIG_PATH"
PKG_CONFIG_PATH="$PWD/pkg-config:$PKG_CONFIG_PATH"
# Update Makefiles
pushd build/workspaces

1
pkgs/top-level/all-packages.nix
View File

@ -27097,6 +27097,7 @@ in
zeroadPackages = dontRecurseIntoAttrs (callPackage ../games/0ad {
wxGTK = wxGTK30;
stdenv = gcc9Stdenv;
});
zeroad = zeroadPackages.zeroad;