From 2c10164855d45eb264bca529d643226507795a55 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 14 Oct 2022 05:13:11 +0200 Subject: [PATCH] megaglest: fix broken build --- pkgs/games/megaglest/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/megaglest/default.nix b/pkgs/games/megaglest/default.nix index 52949cf18aa..21ee6fa3744 100644 --- a/pkgs/games/megaglest/default.nix +++ b/pkgs/games/megaglest/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, cmake, pkg-config, git, curl, SDL2, xercesc, openal, lua, libvlc -, libjpeg, wxGTK, cppunit, ftgl, glew, libogg, libvorbis, buildEnv, libpng +, libjpeg, wxGTK30-gtk3, cppunit, ftgl, glew, libogg, libvorbis, buildEnv, libpng , fontconfig, freetype, xorg, makeWrapper, bash, which, gnome, libGLU, glib , fetchFromGitHub, fetchpatch }: @@ -9,7 +9,7 @@ let name = "megaglest-lib-env"; paths = [ SDL2 xorg.libSM xorg.libICE xorg.libX11 xorg.libXext xercesc openal libvorbis lua libjpeg libpng curl fontconfig ftgl freetype - stdenv.cc.cc glew libGLU wxGTK ]; + stdenv.cc.cc glew libGLU wxGTK30-gtk3 ]; }; path-env = buildEnv { name = "megaglest-path-env"; @@ -38,11 +38,11 @@ stdenv.mkDerivation { ]; nativeBuildInputs = [ cmake pkg-config makeWrapper git ]; - buildInputs = [ curl SDL2 xercesc openal lua libpng libjpeg libvlc wxGTK + buildInputs = [ curl SDL2 xercesc openal lua libpng libjpeg libvlc wxGTK30-gtk3 glib cppunit fontconfig freetype ftgl glew libogg libvorbis libGLU ]; cmakeFlags = [ - "-DCMAKE_INSTALL_PREFIX=$out" + "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}" "-DBUILD_MEGAGLEST=On" "-DBUILD_MEGAGLEST_MAP_EDITOR=On" "-DBUILD_MEGAGLEST_MODEL_IMPORT_EXPORT_TOOLS=On"