BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #195896 from wegank/megaglest-fix

Browse source 
megaglest: fix broken build
This commit is contained in:
Sandro 2022-10-20 03:38:32 +02:00 committed by GitHub
commit c0e2314de6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/games/megaglest/default.nix
View file

@ -1,5 +1,5 @@
{ lib, stdenv, cmake, pkg-config, git, curl, SDL2, xercesc, openal, lua, libvlc { 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 , fontconfig, freetype, xorg, makeWrapper, bash, which, gnome, libGLU, glib
, fetchFromGitHub, fetchpatch , fetchFromGitHub, fetchpatch
}: }:
@ -9,7 +9,7 @@ let
name = "megaglest-lib-env"; name = "megaglest-lib-env";
paths = [ SDL2 xorg.libSM xorg.libICE xorg.libX11 xorg.libXext paths = [ SDL2 xorg.libSM xorg.libICE xorg.libX11 xorg.libXext
xercesc openal libvorbis lua libjpeg libpng curl fontconfig ftgl freetype 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 { path-env = buildEnv {
name = "megaglest-path-env"; name = "megaglest-path-env";
@ -38,11 +38,11 @@ stdenv.mkDerivation {
]; ];
nativeBuildInputs = [ cmake pkg-config makeWrapper git ]; 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 ]; glib cppunit fontconfig freetype ftgl glew libogg libvorbis libGLU ];
cmakeFlags = [ cmakeFlags = [
"-DCMAKE_INSTALL_PREFIX=$out" "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}"
"-DBUILD_MEGAGLEST=On" "-DBUILD_MEGAGLEST=On"
"-DBUILD_MEGAGLEST_MAP_EDITOR=On" "-DBUILD_MEGAGLEST_MAP_EDITOR=On"
"-DBUILD_MEGAGLEST_MODEL_IMPORT_EXPORT_TOOLS=On" "-DBUILD_MEGAGLEST_MODEL_IMPORT_EXPORT_TOOLS=On"