git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #108761 from charvp/fix/zeroad-build
commit8008ebae20ee4a8eeb0267a7d9ff8ab11e72e6a6 authorSandro <sandro.jaeckel@gmail.com> dateWed 20 Jan 2021, 20:14 (6 years ago) parent8dd173c2ce4aa8
3 files changed+7−6
pkgs/games/0ad/default.nix+5−5 pkgs/games/0ad/game.nix+1−1 pkgs/top-level/all-packages.nix+1
pkgs/games/0ad/default.nix+5−5
@@ -1,14 +1,14 @@
1−{ wxGTK, newScope }:
2−
1+{ wxGTK, stdenv, newScope }:
32let
43 callPackage = newScope self;
54
65 self = {
7− zeroad-unwrapped = callPackage ./game.nix { inherit wxGTK; };
6+ zeroad-unwrapped = callPackage ./game.nix { inherit wxGTK stdenv; };
87
9− zeroad-data = callPackage ./data.nix { };
8+ zeroad-data = callPackage ./data.nix { inherit stdenv; };
109
1110 zeroad = callPackage ./wrapper.nix { };
1211 };
1312
14−in self
13+in
14+self
pkgs/games/0ad/game.nix+1−1
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
5050 # Workaround invalid pkg-config name for mozjs
5151 mkdir pkg-config
5252 ln -s ${spidermonkey_38}/lib/pkgconfig/* pkg-config/mozjs-38.pc
53− PKG_CONFIG_PATH="$PWD/pkgconfig:$PKG_CONFIG_PATH"
53+ PKG_CONFIG_PATH="$PWD/pkg-config:$PKG_CONFIG_PATH"
5454
5555 # Update Makefiles
5656 pushd build/workspaces
pkgs/top-level/all-packages.nix+1
@@ -27097,6 +27097,7 @@ in
2709727097
2709827098 zeroadPackages = dontRecurseIntoAttrs (callPackage ../games/0ad {
2709927099 wxGTK = wxGTK30;
27100+ stdenv = gcc9Stdenv;
2710027101 });
2710127102
2710227103 zeroad = zeroadPackages.zeroad;