opendungeons: 0.7.1 -> unstable-2021-11-06

- no stable release for over 5 years, switch to unstable
(fixes ois include path issue)
- update ogre dependency to ogre_1.10 to match cegui's version
(fixes crash on init)

ZHF: #144627

authored by Joerie de Gram and committed by tomberek 50417ddb c3cf40e5

+11 -9
+7 -4
pkgs/games/opendungeons/cmakepaths.patch
··· 1 - --- ../CMakeLists.txt 2 - +++ ../CMakeLists.txt 3 - @@ -31,12 +31,12 @@ 4 - set(OD_PLUGINS_CFG_PATH ".") 5 else() 6 # Set binary and data install locations if we want to use the installer 7 - set(OD_BIN_PATH ${CMAKE_INSTALL_PREFIX}/games CACHE PATH "Absolute path to the game binary directory") 8 + set(OD_BIN_PATH ${CMAKE_INSTALL_PREFIX}/bin CACHE PATH "Absolute path to the game binary directory") 9 set(OD_DATA_PATH ${CMAKE_INSTALL_PREFIX}/share/games/${PROJECT_NAME} CACHE PATH "Absolute path to the game data directory") 10 set(OD_SHARE_PATH ${CMAKE_INSTALL_PREFIX}/share CACHE PATH "Absolute path to the shared data directory (desktop file, icons, etc.)") 11 # Set the plugins.cfg file path to a common but architecture-dependent location. 12 # Because the plugins.cfg Ogre plugins path path may vary depending on the architecture used. 13 - set(OD_PLUGINS_CFG_PATH /etc/${PROJECT_NAME} CACHE PATH "Absolute path to the Ogre plugins.cfg file")
··· 1 + diff --git a/CMakeLists.txt b/CMakeLists.txt 2 + index f8ff3c28..b57ee337 100644 3 + --- a/CMakeLists.txt 4 + +++ b/CMakeLists.txt 5 + @@ -30,13 +30,13 @@ if(WIN32) 6 + set(OD_BIN_PATH ${CMAKE_INSTALL_PREFIX}) 7 else() 8 # Set binary and data install locations if we want to use the installer 9 - set(OD_BIN_PATH ${CMAKE_INSTALL_PREFIX}/games CACHE PATH "Absolute path to the game binary directory") 10 + set(OD_BIN_PATH ${CMAKE_INSTALL_PREFIX}/bin CACHE PATH "Absolute path to the game binary directory") 11 set(OD_DATA_PATH ${CMAKE_INSTALL_PREFIX}/share/games/${PROJECT_NAME} CACHE PATH "Absolute path to the game data directory") 12 set(OD_SHARE_PATH ${CMAKE_INSTALL_PREFIX}/share CACHE PATH "Absolute path to the shared data directory (desktop file, icons, etc.)") 13 + set(OD_MAN_PATH ${OD_SHARE_PATH}/man CACHE PATH "Absolute path to the manpages directory") 14 # Set the plugins.cfg file path to a common but architecture-dependent location. 15 # Because the plugins.cfg Ogre plugins path path may vary depending on the architecture used. 16 - set(OD_PLUGINS_CFG_PATH /etc/${PROJECT_NAME} CACHE PATH "Absolute path to the Ogre plugins.cfg file")
+3 -4
pkgs/games/opendungeons/default.nix
··· 2 3 stdenv.mkDerivation rec { 4 pname = "opendungeons"; 5 - version = "0.7.1"; 6 7 src = fetchFromGitHub { 8 owner = "OpenDungeons"; 9 repo = "OpenDungeons"; 10 - rev = version; 11 - sha256 = "0nipb2h0gn628yxlahjgnfhmpfqa19mjdbj3aqabimdfqds9pryh"; 12 }; 13 14 patches = [ ./cmakepaths.patch ]; 15 16 nativeBuildInputs = [ cmake pkg-config ]; 17 buildInputs = [ ogre cegui boost sfml openal ois ]; 18 - NIX_LDFLAGS = "-lpthread"; 19 20 meta = with lib; { 21 description = "An open source, real time strategy game sharing game elements with the Dungeon Keeper series and Evil Genius";
··· 2 3 stdenv.mkDerivation rec { 4 pname = "opendungeons"; 5 + version = "unstable-2021-11-06"; 6 7 src = fetchFromGitHub { 8 owner = "OpenDungeons"; 9 repo = "OpenDungeons"; 10 + rev = "c180ed1864eab5fbe847d1dd5c5c936c4e45444e"; 11 + sha256 = "0xf7gkpy8ll1h59wyaljf0hr8prg7p4ixz80mxqwcnm9cglpgn63"; 12 }; 13 14 patches = [ ./cmakepaths.patch ]; 15 16 nativeBuildInputs = [ cmake pkg-config ]; 17 buildInputs = [ ogre cegui boost sfml openal ois ]; 18 19 meta = with lib; { 20 description = "An open source, real time strategy game sharing game elements with the Dungeon Keeper series and Evil Genius";
+1 -1
pkgs/top-level/all-packages.nix
··· 30190 openarena = callPackage ../games/openarena { }; 30191 30192 opendungeons = callPackage ../games/opendungeons { 30193 - ogre = ogre1_9; 30194 }; 30195 30196 openlierox = callPackage ../games/openlierox { };
··· 30190 openarena = callPackage ../games/openarena { }; 30191 30192 opendungeons = callPackage ../games/opendungeons { 30193 + ogre = ogre1_10; 30194 }; 30195 30196 openlierox = callPackage ../games/openlierox { };