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

irrlichtmt: 1.9.0mt10 -> 1.9.0mt13

Browse source 
* Use finalAttrs
* Touch support is now unconditional
This commit is contained in:
Francesco Gazzetta 2023-12-08 11:56:40 +01:00
parent b720399753
commit 46da207715
1 changed files with 5 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
pkgs/development/libraries/irrlichtmt/default.nix
View file

@ -7,42 +7,32 @@
, libjpeg , libjpeg
, libGL , libGL
, libX11 , libX11
, withTouchSupport ? false
, libXi , libXi
, libXext , libXext
, Cocoa , Cocoa
, Kernel , Kernel
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "irrlichtmt"; pname = "irrlichtmt";
version = "1.9.0mt10"; version = "1.9.0mt13";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "minetest"; owner = "minetest";
repo = "irrlicht"; repo = "irrlicht";
rev = version; rev = finalAttrs.version;
sha256 = "sha256-PA+gz77XkwxQ3TtubaT0ov9dsT7s3ZlrQxrOkD5ku3g="; hash = "sha256-BlQd7zbpvQnxqLv3IaHWrXzJ1pJFbQQ3DNWDAj14/YY=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
]; ];
# https://github.com/minetest/minetest/pull/10729
postPatch = lib.optionalString (!withTouchSupport) ''
sed -i '1i #define NO_IRR_LINUX_X11_XINPUT2_' include/IrrCompileConfig.h
# HACK: Fix mistake in build script
sed -i '/''${X11_Xi_LIB}/d' source/Irrlicht/CMakeLists.txt
'';
buildInputs = [ buildInputs = [
zlib zlib
libpng libpng
libjpeg libjpeg
libGL libGL
libX11 libX11
] ++ lib.optionals withTouchSupport [
libXi libXi
libXext libXext
] ++ lib.optionals stdenv.isDarwin [ ] ++ lib.optionals stdenv.isDarwin [
@ -58,4 +48,4 @@ stdenv.mkDerivation rec {
maintainers = with lib.maintainers; [ DeeUnderscore ]; maintainers = with lib.maintainers; [ DeeUnderscore ];
description = "Minetest project's fork of Irrlicht, a realtime 3D engine written in C++"; description = "Minetest project's fork of Irrlicht, a realtime 3D engine written in C++";
}; };
} })