ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: Move openmw-openscenegraph to graphics.scm.

Browse source 
Package inheritance across modules may cause unbound variable errors at
expansion time because of cyclic dependencies between the modules.

* gnu/packages/game-development.scm (openmw-openscenegraph): Move from here ...
* gnu/packages/graphics.scm (openmw-openscenegraph): ... to here.  Make the
variable public and "hide" the package.
This commit is contained in:
Marius Bakke 2019-09-24 23:51:48 +02:00
parent 1cfe711ac0
commit 84a0c6ff63
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
2 changed files with 36 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
gnu/packages/game-development.scm
View file

@ -1109,40 +1109,6 @@ (define-public mygui-gl
'("ogre"))))
(synopsis "Fast, flexible and simple GUI (OpenGL backend)")))
(define openmw-openscenegraph
;; OpenMW prefers its own fork of openscenegraph:
;; https://wiki.openmw.org/index.php?title=Development_Environment_Setup#OpenSceneGraph.
(let ((commit "36a962845a2c87a6671fd822157e0729d164e940"))
(package
(inherit openscenegraph)
(version (git-version "3.6" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/OpenMW/osg/")
(commit commit)))
(file-name (git-file-name (package-name openscenegraph) version))
(sha256
(base32
"05yhgq3qm5q277y32n5sf36vx5nv5qd3zlhz4csgd3a6190jrnia"))))
(arguments
(substitute-keyword-arguments (package-arguments openscenegraph)
((#:configure-flags flags)
;; As per the above wiki link, the following plugins are enough:
`(append
'("-DBUILD_OSG_PLUGINS_BY_DEFAULT=0"
"-DBUILD_OSG_PLUGIN_OSG=1"
"-DBUILD_OSG_PLUGIN_DDS=1"
"-DBUILD_OSG_PLUGIN_TGA=1"
"-DBUILD_OSG_PLUGIN_BMP=1"
"-DBUILD_OSG_PLUGIN_JPEG=1"
"-DBUILD_OSG_PLUGIN_PNG=1"
"-DBUILD_OSG_DEPRECATED_SERIALIZERS=0"
;; The jpeg plugin requires conversion between integers and booleans
"-DCMAKE_CXX_FLAGS=-fpermissive")
,flags)))))))
(define-public openmw
(package
(name "openmw")

36
gnu/packages/graphics.scm
View file

@ -589,6 +589,42 @@ (define-public openscenegraph-3.4
`(("libjpeg" ,libjpeg)
,@(package-inputs openscenegraph)))))
(define-public openmw-openscenegraph
;; OpenMW prefers its own fork of openscenegraph:
;; https://wiki.openmw.org/index.php?title=Development_Environment_Setup#OpenSceneGraph.
(let ((commit "36a962845a2c87a6671fd822157e0729d164e940"))
(hidden-package
(package
(inherit openscenegraph)
(version (git-version "3.6" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/OpenMW/osg/")
(commit commit)))
(file-name (git-file-name (package-name openscenegraph) version))
(sha256
(base32
"05yhgq3qm5q277y32n5sf36vx5nv5qd3zlhz4csgd3a6190jrnia"))))
(arguments
(substitute-keyword-arguments (package-arguments openscenegraph)
((#:configure-flags flags)
;; As per the above wiki link, the following plugins are enough:
`(append
'("-DBUILD_OSG_PLUGINS_BY_DEFAULT=0"
"-DBUILD_OSG_PLUGIN_OSG=1"
"-DBUILD_OSG_PLUGIN_DDS=1"
"-DBUILD_OSG_PLUGIN_TGA=1"
"-DBUILD_OSG_PLUGIN_BMP=1"
"-DBUILD_OSG_PLUGIN_JPEG=1"
"-DBUILD_OSG_PLUGIN_PNG=1"
"-DBUILD_OSG_DEPRECATED_SERIALIZERS=0"
;; The jpeg plugin requires conversion between integers and booleans
"-DCMAKE_CXX_FLAGS=-fpermissive")
,flags))))))))
(define-public povray
(package
(name "povray")