minetest: update to 5.1.0 and build on Darwin
This commit is contained in:
committed by
Profpatsch
parent
24720dd250
commit
fb285f2153
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = http://irrlicht.sourceforge.net/;
|
||||
license = stdenv.lib.licenses.zlib;
|
||||
description = "Open source high performance realtime 3D engine written in C++";
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
{ stdenv, fetchzip, libGLU, libGL, unzip, fetchFromGitHub, cmake, Cocoa, OpenGL, IOKit }:
|
||||
|
||||
let
|
||||
version = "1.8.4";
|
||||
|
||||
irrlichtZip = fetchzip {
|
||||
name = "irrlichtZip";
|
||||
url = "mirror://sourceforge/irrlicht/irrlicht-${version}.zip";
|
||||
sha256 = "02sq067fn4xpf0lcyb4vqxmm43qg2nxx770bgrl799yymqbvih5f";
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "irrlicht-mac";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "quiark";
|
||||
repo = "IrrlichtCMake";
|
||||
rev = "523a5e6ef84be67c3014f7b822b97acfced536ce";
|
||||
sha256 = "10ahnry2zl64wphs233gxhvs6c0345pyf5nwa29mc6yn49x7bidi";
|
||||
};
|
||||
|
||||
postUnpack = ''
|
||||
cp -r ${irrlichtZip}/* $sourceRoot/
|
||||
chmod -R 777 $sourceRoot
|
||||
'';
|
||||
|
||||
patches = [ ./mac_device.patch ];
|
||||
dontFixCmake = true;
|
||||
|
||||
cmakeFlags = [
|
||||
"-DIRRLICHT_STATIC_LIBRARY=ON"
|
||||
"-DIRRLICHT_BUILD_EXAMPLES=OFF"
|
||||
"-DIRRLICHT_INSTALL_MEDIA_FILES=OFF"
|
||||
"-DIRRLICHT_ENABLE_X11_SUPPORT=OFF"
|
||||
"-DIRRLICHT_BUILD_TOOLS=OFF"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ unzip OpenGL Cocoa IOKit ];
|
||||
|
||||
meta = {
|
||||
homepage = http://irrlicht.sourceforge.net/;
|
||||
license = stdenv.lib.licenses.zlib;
|
||||
description = "Open source high performance realtime 3D engine written in C++";
|
||||
platforms = stdenv.lib.platforms.darwin;
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
--- a/source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm
|
||||
+++ b/source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm
|
||||
@@ -39,7 +39,7 @@
|
||||
#include <IOKit/hidsystem/IOHIDUsageTables.h>
|
||||
#else
|
||||
/* The header was moved here in Mac OS X 10.1 */
|
||||
-#include <Kernel/IOKit/hidsystem/IOHIDUsageTables.h>
|
||||
+#include <IOKit/hid/IOHIDUsageTables.h>
|
||||
#endif
|
||||
#include <IOKit/hid/IOHIDLib.h>
|
||||
#include <IOKit/hid/IOHIDKeys.h>
|
||||
@@ -496,7 +496,7 @@
|
||||
{
|
||||
[[NSAutoreleasePool alloc] init];
|
||||
[NSApplication sharedApplication];
|
||||
- [NSApp setDelegate:(id<NSFileManagerDelegate>)[[[AppDelegate alloc] initWithDevice:this] autorelease]];
|
||||
+ [NSApp setDelegate:(id<NSApplicationDelegate>)[[[AppDelegate alloc] initWithDevice:this] autorelease]];
|
||||
[NSBundle loadNibNamed:@"MainMenu" owner:[NSApp delegate]];
|
||||
[NSApp finishLaunching];
|
||||
}
|
||||
Reference in New Issue
Block a user