mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-15 02:03:01 +00:00
cb597c229b
This adds a new package: OpenSpace, an open source astrovisualization project, and one of its dependencies: SOIL (Simple OpenGL Image Library). This kind of works for me, but please note that this build is not very usable for now. This is a first attempt. Also, Linux doesn't seem to be well supported upstream, hence the various patches (I will open an issue upstream to discuss them). Squashed commits: openspace: fetch upstream glm "patch" openspace: add missing dependency (libXxf86vm) soil: mesa -> mesa_noglu
14 lines
606 B
Diff
14 lines
606 B
Diff
diff --git a/ext/sgct/src/deps/vrpn/vrpn_Connection.C b/ext/sgct/src/deps/vrpn/vrpn_Connection.C
|
|
index d6ffdc5..f90a2b2 100755
|
|
--- a/ext/sgct/src/deps/vrpn/vrpn_Connection.C
|
|
+++ b/ext/sgct/src/deps/vrpn/vrpn_Connection.C
|
|
@@ -2489,7 +2489,7 @@ static int vrpn_start_server(const char *machine, char *server_name, char *args,
|
|
#if defined(sparc) || defined(FreeBSD) || defined(_AIX) || defined(__ANDROID__)
|
|
int status; // doesn't exist on sparc_solaris or FreeBSD
|
|
#else
|
|
- union wait status;
|
|
+ int status;
|
|
#endif
|
|
|
|
/* Check to see if they called back yet. */
|