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

Merge pull request #246316 from wegank/ogre-14-init

Browse source 
ogre_14: init at 14.0.1
This commit is contained in:
7c6f434c 2023-07-31 13:11:07 +00:00 committed by GitHub
parent dd1ec9047a 956bdd6f22
commit 380f998fe8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 80 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

129
pkgs/development/libraries/ogre/default.nix
View file

@ -27,72 +27,85 @@
, libXxf86vm , libXxf86vm
, xorgproto , xorgproto
# darwin # darwin
, Cocoa , darwin
# optional # optional
, withNvidiaCg ? false , withNvidiaCg ? false
, nvidia_cg_toolkit , nvidia_cg_toolkit
, withSamples ? false , withSamples ? false
}: }:
stdenv.mkDerivation rec { let
pname = "ogre"; common = { version, hash }: stdenv.mkDerivation {
version = "13.6.4"; pname = "ogre";
inherit version;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "OGRECave"; owner = "OGRECave";
repo = "ogre"; repo = "ogre";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-MSBWCO0s46t+ExWDdmqi16OxmcQXnduhgFt6I4BG1g8="; inherit hash;
};
nativeBuildInputs = [
cmake
pkg-config
unzip
];
buildInputs = [
SDL2
boost
freeimage
freetype
libpng
ois
pugixml
zziplib
] ++ lib.optionals stdenv.isLinux [
freeglut
libGL
libGLU
libICE
libSM
libX11
libXaw
libXmu
libXrandr
libXrender
libXt
libXxf86vm
xorgproto
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Cocoa
] ++ lib.optionals withNvidiaCg [
nvidia_cg_toolkit
];
cmakeFlags = [
"-DOGRE_BUILD_COMPONENT_OVERLAY_IMGUI=FALSE"
"-DOGRE_BUILD_DEPENDENCIES=OFF"
"-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;
};
};
in
{
ogre_14 = common {
version = "14.0.1";
hash = "sha256-jtUm0jy0GsxkGlFdODGodPsuSaQgiE77BORnA6SFViU=";
}; };
nativeBuildInputs = [ ogre_13 = common {
cmake version = "13.6.5";
pkg-config hash = "sha256-8VQqePrvf/fleHijVIqWWfwOusGjVR40IIJ13o+HwaE=";
unzip
];
buildInputs = [
SDL2
boost
freeimage
freetype
libpng
ois
pugixml
zziplib
] ++ lib.optionals stdenv.isLinux [
freeglut
libGL
libGLU
libICE
libSM
libX11
libXaw
libXmu
libXrandr
libXrender
libXt
libXxf86vm
xorgproto
] ++ lib.optionals stdenv.isDarwin [
Cocoa
] ++ lib.optionals withNvidiaCg [
nvidia_cg_toolkit
];
cmakeFlags = [
"-DOGRE_BUILD_COMPONENT_OVERLAY_IMGUI=FALSE"
"-DOGRE_BUILD_DEPENDENCIES=OFF"
"-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;
}; };
} }

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

@ -3,7 +3,7 @@
, fetchFromGitHub , fetchFromGitHub
, cmake , cmake
, pkg-config , pkg-config
, ogre , ogre_13
, cegui , cegui
, boost , boost
, sfml , sfml
@ -12,7 +12,7 @@
}: }:
let let
ogre' = ogre.overrideAttrs (old: { ogre' = ogre_13.overrideAttrs (old: {
cmakeFlags = old.cmakeFlags ++ [ cmakeFlags = old.cmakeFlags ++ [
"-DOGRE_RESOURCEMANAGER_STRICT=0" "-DOGRE_RESOURCEMANAGER_STRICT=0"
]; ];

6
pkgs/games/stuntrally/default.nix
View file

@ -3,7 +3,7 @@
, stdenv , stdenv
, cmake , cmake
, boost , boost
, ogre , ogre_13
, mygui , mygui
, ois , ois
, SDL2 , SDL2
@ -19,7 +19,7 @@
}: }:
let let
stuntrally_ogre = ogre.overrideAttrs (old: { stuntrally_ogre = ogre_13.overrideAttrs (old: {
cmakeFlags = old.cmakeFlags ++ [ cmakeFlags = old.cmakeFlags ++ [
"-DOGRE_NODELESS_POSITIONING=ON" "-DOGRE_NODELESS_POSITIONING=ON"
"-DOGRE_RESOURCEMANAGER_STRICT=0" "-DOGRE_RESOURCEMANAGER_STRICT=0"
@ -27,7 +27,7 @@ let
}); });
stuntrally_mygui = mygui.override { stuntrally_mygui = mygui.override {
withOgre = true; withOgre = true;
inherit ogre; ogre = stuntrally_ogre;
}; };
in in

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

@ -23907,9 +23907,10 @@ with pkgs;
ode = callPackage ../development/libraries/ode { }; ode = callPackage ../development/libraries/ode { };
ogre = callPackage ../development/libraries/ogre { inherit (callPackages ../development/libraries/ogre { })
inherit (darwin.apple_sdk.frameworks) Cocoa; ogre_13 ogre_14;
};
ogre = ogre_14;
olm = callPackage ../development/libraries/olm { }; olm = callPackage ../development/libraries/olm { };