b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

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

Browse source 
- 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
This commit is contained in:
Joerie de Gram 2021-11-06 12:47:26 +01:00 committed by tomberek
parent c3cf40e50e
commit 50417ddb87
3 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/games/opendungeons/cmakepaths.patch
View file

@ -1,13 +1,16 @@
--- ../CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
+++ ../CMakeLists.txt index f8ff3c28..b57ee337 100644
@@ -31,12 +31,12 @@ --- a/CMakeLists.txt
set(OD_PLUGINS_CFG_PATH ".") +++ b/CMakeLists.txt
@@ -30,13 +30,13 @@ if(WIN32)
set(OD_BIN_PATH ${CMAKE_INSTALL_PREFIX})
else() else()
# Set binary and data install locations if we want to use the installer # Set binary and data install locations if we want to use the installer
- set(OD_BIN_PATH ${CMAKE_INSTALL_PREFIX}/games CACHE PATH "Absolute path to the game binary directory") - set(OD_BIN_PATH ${CMAKE_INSTALL_PREFIX}/games CACHE PATH "Absolute path to the game binary directory")
+ set(OD_BIN_PATH ${CMAKE_INSTALL_PREFIX}/bin CACHE PATH "Absolute path to the game binary directory") + set(OD_BIN_PATH ${CMAKE_INSTALL_PREFIX}/bin CACHE PATH "Absolute path to the game binary directory")
set(OD_DATA_PATH ${CMAKE_INSTALL_PREFIX}/share/games/${PROJECT_NAME} CACHE PATH "Absolute path to the game data directory") set(OD_DATA_PATH ${CMAKE_INSTALL_PREFIX}/share/games/${PROJECT_NAME} CACHE PATH "Absolute path to the game data directory")
set(OD_SHARE_PATH ${CMAKE_INSTALL_PREFIX}/share CACHE PATH "Absolute path to the shared data directory (desktop file, icons, etc.)") set(OD_SHARE_PATH ${CMAKE_INSTALL_PREFIX}/share CACHE PATH "Absolute path to the shared data directory (desktop file, icons, etc.)")
set(OD_MAN_PATH ${OD_SHARE_PATH}/man CACHE PATH "Absolute path to the manpages directory")
# Set the plugins.cfg file path to a common but architecture-dependent location. # Set the plugins.cfg file path to a common but architecture-dependent location.
# Because the plugins.cfg Ogre plugins path path may vary depending on the architecture used. # Because the plugins.cfg Ogre plugins path path may vary depending on the architecture used.
- set(OD_PLUGINS_CFG_PATH /etc/${PROJECT_NAME} CACHE PATH "Absolute path to the Ogre plugins.cfg file") - set(OD_PLUGINS_CFG_PATH /etc/${PROJECT_NAME} CACHE PATH "Absolute path to the Ogre plugins.cfg file")

7
pkgs/games/opendungeons/default.nix
View file

@ -2,20 +2,19 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "opendungeons"; pname = "opendungeons";
version = "0.7.1"; version = "unstable-2021-11-06";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "OpenDungeons"; owner = "OpenDungeons";
repo = "OpenDungeons"; repo = "OpenDungeons";
rev = version; rev = "c180ed1864eab5fbe847d1dd5c5c936c4e45444e";
sha256 = "0nipb2h0gn628yxlahjgnfhmpfqa19mjdbj3aqabimdfqds9pryh"; sha256 = "0xf7gkpy8ll1h59wyaljf0hr8prg7p4ixz80mxqwcnm9cglpgn63";
}; };
patches = [ ./cmakepaths.patch ]; patches = [ ./cmakepaths.patch ];
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ ogre cegui boost sfml openal ois ]; buildInputs = [ ogre cegui boost sfml openal ois ];
NIX_LDFLAGS = "-lpthread";
meta = with lib; { meta = with lib; {
description = "An open source, real time strategy game sharing game elements with the Dungeon Keeper series and Evil Genius"; description = "An open source, real time strategy game sharing game elements with the Dungeon Keeper series and Evil Genius";

2
pkgs/top-level/all-packages.nix
View file

@ -30190,7 +30190,7 @@ with pkgs;
openarena = callPackage ../games/openarena { }; openarena = callPackage ../games/openarena { };
opendungeons = callPackage ../games/opendungeons { opendungeons = callPackage ../games/opendungeons {
ogre = ogre1_9; ogre = ogre1_10;
}; };
openlierox = callPackage ../games/openlierox { }; openlierox = callPackage ../games/openlierox { };