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

ogre_14: init at 14.0.1

pkgs/development/libraries/ogre/default.nix

@@ -27,22 +27,23 @@
 , libXxf86vm
 , xorgproto
   # darwin
-, Cocoa
+, darwin
   # optional
 , withNvidiaCg ? false
 , nvidia_cg_toolkit
 , withSamples ? false
 }:
 
-stdenv.mkDerivation rec {
+let
+  common = { version, hash }: stdenv.mkDerivation {
     pname = "ogre";
-  version = "13.6.4";
+    inherit version;
 
     src = fetchFromGitHub {
       owner = "OGRECave";
       repo = "ogre";
       rev = "v${version}";
-    hash = "sha256-MSBWCO0s46t+ExWDdmqi16OxmcQXnduhgFt6I4BG1g8=";
+      inherit hash;
     };
 
     nativeBuildInputs = [
@@ -75,7 +76,7 @@ stdenv.mkDerivation rec {
       libXxf86vm
       xorgproto
     ] ++ lib.optionals stdenv.isDarwin [
-    Cocoa
+      darwin.apple_sdk.frameworks.Cocoa
     ] ++ lib.optionals withNvidiaCg [
       nvidia_cg_toolkit
     ];
@@ -95,4 +96,16 @@ stdenv.mkDerivation rec {
       platforms = lib.platforms.unix;
       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=";
+  };
 }

pkgs/games/opendungeons/default.nix

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

pkgs/games/stuntrally/default.nix

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

pkgs/top-level/all-packages.nix

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