diff --git a/pkgs/games/0ad/default.nix b/pkgs/games/0ad/default.nix index d53942766bb..860db7c6d5a 100644 --- a/pkgs/games/0ad/default.nix +++ b/pkgs/games/0ad/default.nix @@ -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 diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix index ae0b2180a80..1ba975aa885 100644 --- a/pkgs/games/0ad/game.nix +++ b/pkgs/games/0ad/game.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e2cd3cde339..671e3f56274 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27097,6 +27097,7 @@ in zeroadPackages = dontRecurseIntoAttrs (callPackage ../games/0ad { wxGTK = wxGTK30; + stdenv = gcc9Stdenv; }); zeroad = zeroadPackages.zeroad;