commit 956bdd6f2268a0ba2fe9b95d6842b570bb36065f · pyrox.dev/nixpkgs

+69 -56

pkgs/development/libraries/ogre/default.nix

··· 27 , libXxf86vm 28 , xorgproto 29 # darwin 30 - , Cocoa 31 # optional 32 , withNvidiaCg ? false 33 , nvidia_cg_toolkit 34 , withSamples ? false 35 }: 36 37 - stdenv.mkDerivation rec { 38 - pname = "ogre"; 39 - version = "13.6.4"; 40 41 - src = fetchFromGitHub { 42 - owner = "OGRECave"; 43 - repo = "ogre"; 44 - rev = "v${version}"; 45 - hash = "sha256-MSBWCO0s46t+ExWDdmqi16OxmcQXnduhgFt6I4BG1g8="; 46 - }; 47 48 - nativeBuildInputs = [ 49 - cmake 50 - pkg-config 51 - unzip 52 - ]; 53 54 - buildInputs = [ 55 - SDL2 56 - boost 57 - freeimage 58 - freetype 59 - libpng 60 - ois 61 - pugixml 62 - zziplib 63 - ] ++ lib.optionals stdenv.isLinux [ 64 - freeglut 65 - libGL 66 - libGLU 67 - libICE 68 - libSM 69 - libX11 70 - libXaw 71 - libXmu 72 - libXrandr 73 - libXrender 74 - libXt 75 - libXxf86vm 76 - xorgproto 77 - ] ++ lib.optionals stdenv.isDarwin [ 78 - Cocoa 79 - ] ++ lib.optionals withNvidiaCg [ 80 - nvidia_cg_toolkit 81 - ]; 82 83 - cmakeFlags = [ 84 - "-DOGRE_BUILD_COMPONENT_OVERLAY_IMGUI=FALSE" 85 - "-DOGRE_BUILD_DEPENDENCIES=OFF" 86 - "-DOGRE_BUILD_SAMPLES=${toString withSamples}" 87 - ] ++ lib.optionals stdenv.isDarwin [ 88 - "-DOGRE_BUILD_LIBS_AS_FRAMEWORKS=FALSE" 89 - ]; 90 91 - meta = { 92 - description = "3D Object-Oriented Graphics Rendering Engine"; 93 - homepage = "https://www.ogre3d.org/"; 94 - maintainers = with lib.maintainers; [ raskin wegank ]; 95 - platforms = lib.platforms.unix; 96 - license = lib.licenses.mit; 97 }; 98 }

··· 27 , libXxf86vm 28 , xorgproto 29 # darwin 30 + , darwin 31 # optional 32 , withNvidiaCg ? false 33 , nvidia_cg_toolkit 34 , withSamples ? false 35 }: 36 37 + let 38 + common = { version, hash }: stdenv.mkDerivation { 39 + pname = "ogre"; 40 + inherit version; 41 42 + src = fetchFromGitHub { 43 + owner = "OGRECave"; 44 + repo = "ogre"; 45 + rev = "v${version}"; 46 + inherit hash; 47 + }; 48 49 + nativeBuildInputs = [ 50 + cmake 51 + pkg-config 52 + unzip 53 + ]; 54 + 55 + buildInputs = [ 56 + SDL2 57 + boost 58 + freeimage 59 + freetype 60 + libpng 61 + ois 62 + pugixml 63 + zziplib 64 + ] ++ lib.optionals stdenv.isLinux [ 65 + freeglut 66 + libGL 67 + libGLU 68 + libICE 69 + libSM 70 + libX11 71 + libXaw 72 + libXmu 73 + libXrandr 74 + libXrender 75 + libXt 76 + libXxf86vm 77 + xorgproto 78 + ] ++ lib.optionals stdenv.isDarwin [ 79 + darwin.apple_sdk.frameworks.Cocoa 80 + ] ++ lib.optionals withNvidiaCg [ 81 + nvidia_cg_toolkit 82 + ]; 83 84 + cmakeFlags = [ 85 + "-DOGRE_BUILD_COMPONENT_OVERLAY_IMGUI=FALSE" 86 + "-DOGRE_BUILD_DEPENDENCIES=OFF" 87 + "-DOGRE_BUILD_SAMPLES=${toString withSamples}" 88 + ] ++ lib.optionals stdenv.isDarwin [ 89 + "-DOGRE_BUILD_LIBS_AS_FRAMEWORKS=FALSE" 90 + ]; 91 92 + meta = { 93 + description = "3D Object-Oriented Graphics Rendering Engine"; 94 + homepage = "https://www.ogre3d.org/"; 95 + maintainers = with lib.maintainers; [ raskin wegank ]; 96 + platforms = lib.platforms.unix; 97 + license = lib.licenses.mit; 98 + }; 99 + }; 100 + in 101 + { 102 + ogre_14 = common { 103 + version = "14.0.1"; 104 + hash = "sha256-jtUm0jy0GsxkGlFdODGodPsuSaQgiE77BORnA6SFViU="; 105 + }; 106 107 + ogre_13 = common { 108 + version = "13.6.5"; 109 + hash = "sha256-8VQqePrvf/fleHijVIqWWfwOusGjVR40IIJ13o+HwaE="; 110 }; 111 }

+2 -2

pkgs/games/opendungeons/default.nix

··· 3 , fetchFromGitHub 4 , cmake 5 , pkg-config 6 - , ogre 7 , cegui 8 , boost 9 , sfml ··· 12 }: 13 14 let 15 - ogre' = ogre.overrideAttrs (old: { 16 cmakeFlags = old.cmakeFlags ++ [ 17 "-DOGRE_RESOURCEMANAGER_STRICT=0" 18 ];

··· 3 , fetchFromGitHub 4 , cmake 5 , pkg-config 6 + , ogre_13 7 , cegui 8 , boost 9 , sfml ··· 12 }: 13 14 let 15 + ogre' = ogre_13.overrideAttrs (old: { 16 cmakeFlags = old.cmakeFlags ++ [ 17 "-DOGRE_RESOURCEMANAGER_STRICT=0" 18 ];

+3 -3

pkgs/games/stuntrally/default.nix

··· 3 , stdenv 4 , cmake 5 , boost 6 - , ogre 7 , mygui 8 , ois 9 , SDL2 ··· 19 }: 20 21 let 22 - stuntrally_ogre = ogre.overrideAttrs (old: { 23 cmakeFlags = old.cmakeFlags ++ [ 24 "-DOGRE_NODELESS_POSITIONING=ON" 25 "-DOGRE_RESOURCEMANAGER_STRICT=0" ··· 27 }); 28 stuntrally_mygui = mygui.override { 29 withOgre = true; 30 - inherit ogre; 31 }; 32 in 33

··· 3 , stdenv 4 , cmake 5 , boost 6 + , ogre_13 7 , mygui 8 , ois 9 , SDL2 ··· 19 }: 20 21 let 22 + stuntrally_ogre = ogre_13.overrideAttrs (old: { 23 cmakeFlags = old.cmakeFlags ++ [ 24 "-DOGRE_NODELESS_POSITIONING=ON" 25 "-DOGRE_RESOURCEMANAGER_STRICT=0" ··· 27 }); 28 stuntrally_mygui = mygui.override { 29 withOgre = true; 30 + ogre = stuntrally_ogre; 31 }; 32 in 33

+4 -3

pkgs/top-level/all-packages.nix

··· 23903 23904 ode = callPackage ../development/libraries/ode { }; 23905 23906 - ogre = callPackage ../development/libraries/ogre { 23907 - inherit (darwin.apple_sdk.frameworks) Cocoa; 23908 - }; 23909 23910 olm = callPackage ../development/libraries/olm { }; 23911

··· 23903 23904 ode = callPackage ../development/libraries/ode { }; 23905 23906 + inherit (callPackages ../development/libraries/ogre { }) 23907 + ogre_13 ogre_14; 23908 + 23909 + ogre = ogre_14; 23910 23911 olm = callPackage ../development/libraries/olm { }; 23912