cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #242458 from fgaz/minetest/luajit-where-supported

Browse source 
minetest: use lua5_1 if luajit is not supported
This commit is contained in:
Franz Pletz 2023-07-11 11:06:35 +02:00 committed by GitHub
commit 65b7af41bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/games/minetest/default.nix
View file

@ -14,6 +14,7 @@
, openal , openal
, libvorbis , libvorbis
, sqlite , sqlite
, lua5_1
, luajit , luajit
, freetype , freetype
, gettext , gettext
@ -93,8 +94,9 @@ let
nativeBuildInputs = [ cmake doxygen graphviz ninja ]; nativeBuildInputs = [ cmake doxygen graphviz ninja ];
buildInputs = [ buildInputs = [
irrlichtmtInput luajit jsoncpp gettext freetype sqlite curl bzip2 ncurses irrlichtmtInput jsoncpp gettext freetype sqlite curl bzip2 ncurses
gmp libspatialindex gmp libspatialindex
] ++ [ (if lib.meta.availableOn stdenv.hostPlatform luajit then luajit else lua5_1) ] ++ [
] ++ optionals stdenv.isDarwin [ ] ++ optionals stdenv.isDarwin [
libiconv OpenGL OpenAL Carbon Cocoa libiconv OpenGL OpenAL Carbon Cocoa
] ++ optionals buildClient [ ] ++ optionals buildClient [