Merge pull request #244457 from wegank/ogre-cleanup
opendungeons: unstable-2021-11-06 -> unstable-2023-03-18
This commit is contained in:
commit
b21b03e8f7
|
@ -1,19 +1,53 @@
|
||||||
{ lib, stdenv, fetchurl, cmake, ogre, freetype, boost, expat, libiconv }:
|
{ lib
|
||||||
|
, stdenv
|
||||||
|
, fetchFromGitHub
|
||||||
|
, cmake
|
||||||
|
, ogre
|
||||||
|
, freetype
|
||||||
|
, boost
|
||||||
|
, expat
|
||||||
|
, darwin
|
||||||
|
, libiconv
|
||||||
|
, unstableGitUpdater
|
||||||
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation {
|
||||||
pname = "cegui";
|
pname = "cegui";
|
||||||
version = "0.8.7";
|
version = "unstable-2023-03-18";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchFromGitHub {
|
||||||
url = "mirror://sourceforge/crayzedsgui/${pname}-${version}.tar.bz2";
|
owner = "paroj";
|
||||||
sha256 = "067562s71kfsnbp2zb2bmq8zj3jk96g5a4rcc5qc3n8nfyayhldk";
|
repo = "cegui";
|
||||||
|
rev = "186ce900e293b98f2721c11930248a8de54aa338";
|
||||||
|
hash = "sha256-RJ4MnxklcuxC+ZYEbfma5RDc2aeJ95LuTwNk+FnEhdo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
strictDeps = true;
|
||||||
buildInputs = [ ogre freetype boost expat ]
|
|
||||||
++ lib.optionals stdenv.isDarwin [ libiconv ];
|
|
||||||
|
|
||||||
cmakeFlags = lib.optional (stdenv.isDarwin && stdenv.isAarch64) "-DCMAKE_OSX_ARCHITECTURES=arm64";
|
nativeBuildInputs = [
|
||||||
|
cmake
|
||||||
|
];
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
ogre
|
||||||
|
freetype
|
||||||
|
boost
|
||||||
|
expat
|
||||||
|
] ++ lib.optionals stdenv.isDarwin [
|
||||||
|
darwin.apple_sdk.frameworks.Cocoa
|
||||||
|
darwin.apple_sdk.frameworks.Foundation
|
||||||
|
libiconv
|
||||||
|
];
|
||||||
|
|
||||||
|
cmakeFlags = [
|
||||||
|
"-DCEGUI_OPTION_DEFAULT_IMAGECODEC=OgreRenderer-0"
|
||||||
|
] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
|
||||||
|
"-DCMAKE_OSX_ARCHITECTURES=${stdenv.hostPlatform.darwinArch}"
|
||||||
|
];
|
||||||
|
|
||||||
|
passthru.updateScript = unstableGitUpdater {
|
||||||
|
branch = "v0";
|
||||||
|
};
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "http://cegui.org.uk/";
|
homepage = "http://cegui.org.uk/";
|
||||||
|
|
|
@ -1,110 +0,0 @@
|
||||||
{ lib
|
|
||||||
, stdenv
|
|
||||||
, fetchurl
|
|
||||||
, fetchpatch
|
|
||||||
, cmake
|
|
||||||
, pkg-config
|
|
||||||
, boost
|
|
||||||
, freeimage
|
|
||||||
, freetype
|
|
||||||
, libpng
|
|
||||||
, ois
|
|
||||||
, zziplib
|
|
||||||
, freeglut
|
|
||||||
, libGL
|
|
||||||
, libGLU
|
|
||||||
, libICE
|
|
||||||
, libSM
|
|
||||||
, libX11
|
|
||||||
, libXaw
|
|
||||||
, libXmu
|
|
||||||
, libXrandr
|
|
||||||
, libXrender
|
|
||||||
, libXt
|
|
||||||
, libXxf86vm
|
|
||||||
, xorgproto
|
|
||||||
, darwin
|
|
||||||
, withNvidiaCg ? false
|
|
||||||
, nvidia_cg_toolkit
|
|
||||||
, withSamples ? false
|
|
||||||
}:
|
|
||||||
|
|
||||||
let
|
|
||||||
inherit (darwin.apple_sdk.frameworks) AGL Cocoa;
|
|
||||||
in
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
pname = "ogre";
|
|
||||||
version = "1.10.11";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "https://bitbucket.org/sinbad/ogre/get/v${lib.replaceStrings ["."] ["-"] version}.tar.gz";
|
|
||||||
sha256 = "1zwvlx5dz9nwjazhnrhzb0w8ilpa84r0hrxrmmy69pgr1p1yif5a";
|
|
||||||
};
|
|
||||||
|
|
||||||
patches = [
|
|
||||||
# aarch64-darwin support
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://github.com/OGRECave/ogre/commit/bd5fbe3482c56e58c6c3b3bf439b1eab8c1be258.patch";
|
|
||||||
includes = [ "OgreMain/include/OgrePlatform*.h" ];
|
|
||||||
sha256 = "sha256-ELeCklQkltz7DeDaGl78Jk1H3Wdfu8fMUiMZaJM4s/Y=";
|
|
||||||
})
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://github.com/OGRECave/ogre/commit/0873244cc06b613ca2afbcb5522fe9ef89f111c5.patch";
|
|
||||||
sha256 = "sha256-xGvlMB55B2rdthxNMIM5iFf9p/6zuE8bGL9P04qtweQ=";
|
|
||||||
})
|
|
||||||
# aarch64-linux support
|
|
||||||
(fetchpatch {
|
|
||||||
name = "fix-build-on-aarch64-linux.patch";
|
|
||||||
url = "https://github.com/OGRECave/ogre/commit/8ec086e9bc2e24fab373b514c572483b69071d69.patch";
|
|
||||||
sha256 = "sha256-22wlJPZ7lRIPAMqvpI/2YI0neQjGi1UXt8y5zNSpxCw=";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
|
||||||
cmake
|
|
||||||
pkg-config
|
|
||||||
];
|
|
||||||
|
|
||||||
buildInputs = [
|
|
||||||
boost
|
|
||||||
freeimage
|
|
||||||
freetype
|
|
||||||
libpng
|
|
||||||
ois
|
|
||||||
zziplib
|
|
||||||
] ++ lib.optionals stdenv.isLinux [
|
|
||||||
freeglut
|
|
||||||
libGL
|
|
||||||
libGLU
|
|
||||||
libICE
|
|
||||||
libSM
|
|
||||||
libX11
|
|
||||||
libXaw
|
|
||||||
libXmu
|
|
||||||
libXrandr
|
|
||||||
libXrender
|
|
||||||
libXt
|
|
||||||
libXxf86vm
|
|
||||||
xorgproto
|
|
||||||
] ++ lib.optionals stdenv.isDarwin [
|
|
||||||
AGL
|
|
||||||
Cocoa
|
|
||||||
] ++ lib.optionals withNvidiaCg [
|
|
||||||
nvidia_cg_toolkit
|
|
||||||
];
|
|
||||||
|
|
||||||
cmakeFlags = [
|
|
||||||
"-DOGRE_BUILD_COMPONENT_OVERLAY_IMGUI=FALSE"
|
|
||||||
"-DOGRE_BUILD_SAMPLES=${toString withSamples}"
|
|
||||||
] ++ lib.optionals stdenv.isDarwin [
|
|
||||||
"-DOGRE_BUILD_LIBS_AS_FRAMEWORKS=FALSE"
|
|
||||||
];
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
description = "3D Object-Oriented Graphics Rendering Engine";
|
|
||||||
homepage = "https://www.ogre3d.org/";
|
|
||||||
maintainers = with lib.maintainers; [ raskin wegank ];
|
|
||||||
platforms = lib.platforms.unix;
|
|
||||||
license = lib.licenses.mit;
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -1,14 +1,35 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, ogre, cegui, boost, sfml, openal, cmake, ois, pkg-config }:
|
{ lib
|
||||||
|
, stdenv
|
||||||
|
, fetchFromGitHub
|
||||||
|
, cmake
|
||||||
|
, pkg-config
|
||||||
|
, ogre
|
||||||
|
, cegui
|
||||||
|
, boost
|
||||||
|
, sfml
|
||||||
|
, openal
|
||||||
|
, ois
|
||||||
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
let
|
||||||
|
ogre' = ogre.overrideAttrs (old: {
|
||||||
|
cmakeFlags = old.cmakeFlags ++ [
|
||||||
|
"-DOGRE_RESOURCEMANAGER_STRICT=0"
|
||||||
|
];
|
||||||
|
});
|
||||||
|
cegui' = cegui.override {
|
||||||
|
ogre = ogre';
|
||||||
|
};
|
||||||
|
in
|
||||||
|
stdenv.mkDerivation {
|
||||||
pname = "opendungeons";
|
pname = "opendungeons";
|
||||||
version = "unstable-2021-11-06";
|
version = "unstable-2023-03-18";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "OpenDungeons";
|
owner = "paroj";
|
||||||
repo = "OpenDungeons";
|
repo = "OpenDungeons";
|
||||||
rev = "c180ed1864eab5fbe847d1dd5c5c936c4e45444e";
|
rev = "974378d75591214dccbe0fb26e6ec8a40c2156e0";
|
||||||
sha256 = "0xf7gkpy8ll1h59wyaljf0hr8prg7p4ixz80mxqwcnm9cglpgn63";
|
hash = "sha256-vz9cT+rNcyKT3W9I9VRKcFol2SH1FhOhOALALjgKfIE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
@ -21,8 +42,25 @@ stdenv.mkDerivation rec {
|
||||||
cp source/utils/StackTrace{Stub,Unix}.cpp
|
cp source/utils/StackTrace{Stub,Unix}.cpp
|
||||||
'';
|
'';
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake pkg-config ];
|
strictDeps = true;
|
||||||
buildInputs = [ ogre cegui boost sfml openal ois ];
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
cmake
|
||||||
|
pkg-config
|
||||||
|
];
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
ogre'
|
||||||
|
cegui'
|
||||||
|
boost
|
||||||
|
sfml
|
||||||
|
openal
|
||||||
|
ois
|
||||||
|
];
|
||||||
|
|
||||||
|
cmakeFlags = [
|
||||||
|
"-DOD_TREAT_WARNINGS_AS_ERRORS=FALSE"
|
||||||
|
];
|
||||||
|
|
||||||
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";
|
||||||
|
|
|
@ -1212,6 +1212,7 @@ mapAliases ({
|
||||||
odpdown = throw "odpdown has been removed because it lacks python3 support"; # Added 2022-04-25
|
odpdown = throw "odpdown has been removed because it lacks python3 support"; # Added 2022-04-25
|
||||||
ofp = throw "ofp is not compatible with odp-dpdk";
|
ofp = throw "ofp is not compatible with odp-dpdk";
|
||||||
ogre1_9 = throw "ogre1_9 has been removed, use ogre instead"; # Added 2023-03-22
|
ogre1_9 = throw "ogre1_9 has been removed, use ogre instead"; # Added 2023-03-22
|
||||||
|
ogre1_10 = throw "ogre1_10 has been removed, use ogre instead"; # Added 2023-07-20
|
||||||
olifant = throw "olifant has been removed from nixpkgs, as it was unmaintained"; # Added 2021-08-05
|
olifant = throw "olifant has been removed from nixpkgs, as it was unmaintained"; # Added 2021-08-05
|
||||||
opa = throw "opa has been removed from nixpkgs as upstream has abandoned the project"; # Added 2023-03-21
|
opa = throw "opa has been removed from nixpkgs as upstream has abandoned the project"; # Added 2023-03-21
|
||||||
opam_1_2 = throw "'opam_1_2' has been renamed to/replaced by 'opam'"; # Added 2023-03-08
|
opam_1_2 = throw "'opam_1_2' has been renamed to/replaced by 'opam'"; # Added 2023-03-08
|
||||||
|
|
|
@ -20502,9 +20502,7 @@ with pkgs;
|
||||||
celt_0_7 = callPackage ../development/libraries/celt/0.7.nix { };
|
celt_0_7 = callPackage ../development/libraries/celt/0.7.nix { };
|
||||||
celt_0_5_1 = callPackage ../development/libraries/celt/0.5.1.nix { };
|
celt_0_5_1 = callPackage ../development/libraries/celt/0.5.1.nix { };
|
||||||
|
|
||||||
cegui = callPackage ../development/libraries/cegui {
|
cegui = callPackage ../development/libraries/cegui { };
|
||||||
ogre = ogre1_10;
|
|
||||||
};
|
|
||||||
|
|
||||||
certbot = python3.pkgs.toPythonApplication python3.pkgs.certbot;
|
certbot = python3.pkgs.toPythonApplication python3.pkgs.certbot;
|
||||||
|
|
||||||
|
@ -23906,7 +23904,6 @@ with pkgs;
|
||||||
ogre = callPackage ../development/libraries/ogre {
|
ogre = callPackage ../development/libraries/ogre {
|
||||||
inherit (darwin.apple_sdk.frameworks) Cocoa;
|
inherit (darwin.apple_sdk.frameworks) Cocoa;
|
||||||
};
|
};
|
||||||
ogre1_10 = callPackage ../development/libraries/ogre/1.10.x.nix { };
|
|
||||||
|
|
||||||
olm = callPackage ../development/libraries/olm { };
|
olm = callPackage ../development/libraries/olm { };
|
||||||
|
|
||||||
|
@ -37621,9 +37618,7 @@ with pkgs;
|
||||||
|
|
||||||
openarena = callPackage ../games/openarena { };
|
openarena = callPackage ../games/openarena { };
|
||||||
|
|
||||||
opendungeons = callPackage ../games/opendungeons {
|
opendungeons = callPackage ../games/opendungeons { };
|
||||||
ogre = ogre1_10;
|
|
||||||
};
|
|
||||||
|
|
||||||
openlierox = callPackage ../games/openlierox { };
|
openlierox = callPackage ../games/openlierox { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue