diff --git a/pkgs/by-name/ze/zeroad-unwrapped/package.nix b/pkgs/by-name/ze/zeroad-unwrapped/package.nix index 3a16aaf5c3b6..88b8637d90e9 100644 --- a/pkgs/by-name/ze/zeroad-unwrapped/package.nix +++ b/pkgs/by-name/ze/zeroad-unwrapped/package.nix @@ -4,7 +4,7 @@ perl, fetchurl, python3, - fmt, + fmt_9, libidn, pkg-config, spidermonkey_115, @@ -34,7 +34,7 @@ cxxtest, freetype, withEditor ? true, - wxGTK, + wxGTK32, }: # You can find more instructions on how to build 0ad here: @@ -80,19 +80,19 @@ stdenv.mkDerivation rec { gloox nvidia-texture-tools libsodium - fmt + fmt_9 freetype premake5 cxxtest ] - ++ lib.optional withEditor wxGTK; + ++ lib.optional withEditor wxGTK32; env.NIX_CFLAGS_COMPILE = toString [ "-I${xorgproto}/include" "-I${libX11.dev}/include" "-I${libXcursor.dev}/include" "-I${SDL2}/include/SDL2" - "-I${fmt.dev}/include" + "-I${fmt_9.dev}/include" "-I${nvidia-texture-tools.dev}/include" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 344288d86e77..eee777b4bcfe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12473,11 +12473,6 @@ with pkgs; yquake2-all-games ; - zeroad-unwrapped = callPackage ../by-name/ze/zeroad-unwrapped/package.nix { - wxGTK = wxGTK32; - fmt = fmt_9; - }; - ### DESKTOP ENVIRONMENTS arcan-wrapped = arcan.wrapper.override { };