nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 15:03:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

ogre_14: init at 14.0.1

Browse Source
This commit is contained in:
Weijia Wang 2023-07-31 10:08:12 +02:00
parent 609d704145
commit 956bdd6f22
4 changed files with 80 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/development/libraries/ogre/default.nix
View File

@ -27,22 +27,23 @@
, 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
common = { version, hash }: stdenv.mkDerivation {
pname = "ogre"; pname = "ogre";
version = "13.6.4"; 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 = [ nativeBuildInputs = [
@ -75,7 +76,7 @@ stdenv.mkDerivation rec {
libXxf86vm libXxf86vm
xorgproto xorgproto
] ++ lib.optionals stdenv.isDarwin [ ] ++ lib.optionals stdenv.isDarwin [
Cocoa darwin.apple_sdk.frameworks.Cocoa
] ++ lib.optionals withNvidiaCg [ ] ++ lib.optionals withNvidiaCg [
nvidia_cg_toolkit nvidia_cg_toolkit
]; ];
@ -95,4 +96,16 @@ stdenv.mkDerivation rec {
platforms = lib.platforms.unix; platforms = lib.platforms.unix;
license = lib.licenses.mit; license = lib.licenses.mit;
}; };
};
in
{
ogre_14 = common {
version = "14.0.1";
hash = "sha256-jtUm0jy0GsxkGlFdODGodPsuSaQgiE77BORnA6SFViU=";
};
ogre_13 = common {
version = "13.6.5";
hash = "sha256-8VQqePrvf/fleHijVIqWWfwOusGjVR40IIJ13o+HwaE=";
};
} }

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

@ -23903,9 +23903,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 { };