commit 60bfd9f7d412d164545fcd350ab0842417e4aa33 · pyrox.dev/nixpkgs

+54

pkgs/by-name/co/collada-dom/package.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         stdenv,

     

       4
       4
       +
         fetchFromGitHub,

     

       5
       5
       +
         cmake,

     

       6
       6
       +
         boost,

     

       7
       7
       +
         libxml2,

     

       8
       8
       +
         minizip,

     

       9
       9
       +
         readline,

     

       10
       10
       +
       }:

     

       11
       11
       +
       

     

       12
       12
       +
       stdenv.mkDerivation (finalAttrs: {

     

       13
       13
       +
         pname = "collada-dom";

     

       14
       14
       +
         version = "2.5.1";

     

       15
       15
       +
       

     

       16
       16
       +
         __structuredAttrs = true;

     

       17
       17
       +
         strictDeps = true;

     

       18
       18
       +
       

     

       19
       19
       +
         src = fetchFromGitHub {

     

       20
       20
       +
           owner = "Gepetto";

     

       21
       21
       +
           repo = "collada-dom";

     

       22
       22
       +
           tag = "v${finalAttrs.version}";

     

       23
       23
       +
           hash = "sha256-DYdqrwRIrVq0BQqZB0vtZzADteJGVaJtFC5kC/cD250=";

     

       24
       24
       +
         };

     

       25
       25
       +
       

     

       26
       26
       +
         postInstall = ''

     

       27
       27
       +
           ln -s $out/include/*/* $out/include

     

       28
       28
       +
         '';

     

       29
       29
       +
       

     

       30
       30
       +
         nativeBuildInputs = [ cmake ];

     

       31
       31
       +
       

     

       32
       32
       +
         buildInputs = [

     

       33
       33
       +
           boost

     

       34
       34
       +
           libxml2

     

       35
       35
       +
           minizip

     

       36
       36
       +
           readline

     

       37
       37
       +
         ];

     

       38
       38
       +
       

     

       39
       39
       +
         meta = {

     

       40
       40
       +
           description = "API that provides a C++ object representation of a COLLADA XML instance document";

     

       41
       41
       +
           longDescription = "This is a fork of [rdiankov/collada-dom](https://github.com/rdiankov/collada-dom) which has been unmaintained for six years.";

     

       42
       42
       +
           homepage = "https://github.com/Gepetto/collada-dom";

     

       43
       43
       +
           changelog = "https://github.com/Gepetto/collada-dom/releases/tag/${finalAttrs.src.tag}";

     

       44
       44
       +
           license = lib.licenses.mit;

     

       45
       45
       +
           maintainers = with lib.maintainers; [

     

       46
       46
       +
             sigmasquadron

     

       47
       47
       +
             marius851000

     

       48
       48
       +
           ];

     

       49
       49
       +
           platforms = lib.platforms.all;

     

       50
       50
       +
       

     

       51
       51
       +
           # Fails to build.

     

       52
       52
       +
           badPlatforms = lib.platforms.darwin;

     

       53
       53
       +
         };

     

       54
       54
       +
       })

-20

pkgs/by-name/my/mygui/disable-framework.patch

···

       1
       1
       -
       diff --git a/CMake/Utils/MyGUIConfigTargets.cmake b/CMake/Utils/MyGUIConfigTargets.cmake

     

       2
       2
       -
       index 7e279c986..b33f097c0 100644

     

       3
       3
       -
       --- a/CMake/Utils/MyGUIConfigTargets.cmake

     

       4
       4
       -
       +++ b/CMake/Utils/MyGUIConfigTargets.cmake

     

       5
       5
       -
       @@ -418,15 +418,6 @@ function(mygui_config_lib PROJECTNAME)

     

       6
       6
       -
        		if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "Intel")

     

       7
       7
       -
        			# add GCC visibility flags to shared library build

     

       8
       8
       -
        			set_target_properties(${PROJECTNAME} PROPERTIES COMPILE_FLAGS "${MYGUI_GCC_VISIBILITY_FLAGS}")

     

       9
       9
       -
       -			if (APPLE)

     

       10
       10
       -
       -				# deal with Mac OS X's framework system

     

       11
       11
       -
       -				set_target_properties(${PROJECTNAME} PROPERTIES FRAMEWORK TRUE)

     

       12
       12
       -
       -				set_target_properties(${PROJECTNAME} PROPERTIES PUBLIC_HEADER "${${PROJECTNAME}_HEADERS}")

     

       13
       13
       -
       -				set_target_properties(${PROJECTNAME} PROPERTIES OUTPUT_NAME ${PROJECTNAME})

     

       14
       14
       -
       -				set_target_properties(${PROJECTNAME} PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE)

     

       15
       15
       -
       -				set_target_properties(${PROJECTNAME} PROPERTIES BUILD_WITH_INSTALL_NAME_DIR TRUE)

     

       16
       16
       -
       -				set_target_properties(${PROJECTNAME} PROPERTIES INSTALL_NAME_DIR "@executable_path/../lib")

     

       17
       17
       -
       -			endif (APPLE)

     

       18
       18
       -
        		endif ()

     

       19
       19
       -
        	endif (MYGUI_STATIC)

     

       20
       20
       -
        	mygui_install_target(${PROJECTNAME} "")

+26 -12

pkgs/by-name/my/mygui/package.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         stdenv,

     

       4
       4
        
         fetchFromGitHub,

     

       5
       5
       +
         fetchpatch,

     

       5
       6
        
         cmake,

     

       6
       7
        
         pkg-config,

     

       7
       8
        
         boost,

     
···

       18
       19
        
       let

     

       19
       20
        
         renderSystem = if withOgre then "3" else "4";

     

       20
       21
        
       in

     

       21
       21
       -
       stdenv.mkDerivation rec {

     

       22
       22
       +
       stdenv.mkDerivation (finalAttrs: {

     

       22
       23
        
         pname = "mygui";

     

       23
       23
       -
         version = "3.4.2";

     

       24
       24
       +
         version = "3.4.3";

     

       25
       25
       +
       

     

       26
       26
       +
         __structuredAttrs = true;

     

       27
       27
       +
         strictDeps = true;

     

       24
       28
        
       

     

       25
       29
        
         src = fetchFromGitHub {

     

       26
       30
        
           owner = "MyGUI";

     

       27
       31
        
           repo = "mygui";

     

       28
       28
       -
           rev = "MyGUI${version}";

     

       29
       29
       -
           hash = "sha256-yBV0ImOFJlqBPqqOjXYe4SFO2liSGZCEwvehED5Ubj4=";

     

       32
       32
       +
           tag = "MyGUI${finalAttrs.version}";

     

       33
       33
       +
           hash = "sha256-qif9trHgtWpYiDVXY3cjRsXypjjjgStX8tSWCnXhXlk=";

     

       30
       34
        
         };

     

       31
       35
        
       

     

       32
       36
        
         patches = [

     

       33
       33
       -
           ./disable-framework.patch

     

       37
       37
       +
           (fetchpatch {

     

       38
       38
       +
             name = "darwin-mygui-framework-fix.patch";

     

       39
       39
       +
             url = "https://gitlab.com/OpenMW/openmw-dep/-/raw/ade30e6e98c051ac2a505f6984518f5f41fa87a5/macos/mygui.patch";

     

       40
       40
       +
             sha256 = "sha256-Tk+O4TFgPZOqWAY4c0Q69bZfvIB34wN9e7h0tXhLULU=";

     

       41
       41
       +
           })

     

       34
       42
        
         ];

     

       35
       43
        
       

     

       36
       44
        
         nativeBuildInputs = [

     
···

       57
       65
        
       

     

       58
       66
        
         # Tools are disabled due to compilation failures.

     

       59
       67
        
         cmakeFlags = [

     

       60
       60
       -
           "-DMYGUI_BUILD_TOOLS=OFF"

     

       61
       61
       -
           "-DMYGUI_BUILD_DEMOS=OFF"

     

       62
       62
       -
           "-DMYGUI_RENDERSYSTEM=${renderSystem}"

     

       68
       68
       +
           (lib.cmakeBool "MYGUI_BUILD_DEMOS" false)

     

       69
       69
       +
           (lib.cmakeBool "MYGUI_BUILD_TOOLS" false)

     

       70
       70
       +
           (lib.cmakeBool "MYGUI_DONT_USE_OBSOLETE" true)

     

       71
       71
       +
           (lib.cmakeFeature "MYGUI_RENDERSYSTEM" renderSystem)

     

       63
       72
        
         ];

     

       64
       73
        
       

     

       65
       65
       -
         meta = with lib; {

     

       74
       74
       +
         meta = {

     

       66
       75
        
           homepage = "http://mygui.info/";

     

       76
       76
       +
           changelog = "https://github.com/MyGUI/mygui/releases/tag/MyGUI${finalAttrs.version}";

     

       67
       77
        
           description = "Library for creating GUIs for games and 3D applications";

     

       68
       68
       -
           license = licenses.mit;

     

       69
       69
       -
           platforms = platforms.unix;

     

       78
       78
       +
           maintainers = with lib.maintainers; [ sigmasquadron ];

     

       79
       79
       +
           license = lib.licenses.mit;

     

       80
       80
       +
           platforms = lib.platforms.unix;

     

       81
       81
       +
       

     

       82
       82
       +
           # error: implicit instantiation of undefined template 'std::char_traits'

     

       83
       83
       +
           badPlatforms = lib.platforms.darwin;

     

       70
       84
        
         };

     

       71
       71
       -
       }

     

       85
       85
       +
       })

+149

pkgs/by-name/op/openmw/package.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         stdenv,

     

       4
       4
       +
         fetchFromGitLab,

     

       5
       5
       +
         fetchpatch,

     

       6
       6
       +
       

     

       7
       7
       +
         SDL2,

     

       8
       8
       +
         boost,

     

       9
       9
       +
         bullet,

     

       10
       10
       +
         cmake,

     

       11
       11
       +
         collada-dom,

     

       12
       12
       +
         ffmpeg,

     

       13
       13
       +
         libXt,

     

       14
       14
       +
         lua,

     

       15
       15
       +
         luajit,

     

       16
       16
       +
         lz4,

     

       17
       17
       +
         mygui,

     

       18
       18
       +
         openal,

     

       19
       19
       +
         openscenegraph,

     

       20
       20
       +
         pkg-config,

     

       21
       21
       +
         qt6Packages,

     

       22
       22
       +
         recastnavigation,

     

       23
       23
       +
         unshield,

     

       24
       24
       +
         yaml-cpp,

     

       25
       25
       +
       

     

       26
       26
       +
         GLPreference ? "GLVND",

     

       27
       27
       +
       }:

     

       28
       28
       +
       let

     

       29
       29
       +
         inherit (stdenv.hostPlatform) isDarwin isLinux isAarch64;

     

       30
       30
       +
         isAarch64Linux = isLinux && isAarch64;

     

       31
       31
       +
       in

     

       32
       32
       +
       assert lib.assertOneOf "GLPreference" GLPreference [

     

       33
       33
       +
         "GLVND"

     

       34
       34
       +
         "LEGACY"

     

       35
       35
       +
       ];

     

       36
       36
       +
       stdenv.mkDerivation (finalAttrs: {

     

       37
       37
       +
         pname = "openmw";

     

       38
       38
       +
         version = "0.49.0";

     

       39
       39
       +
       

     

       40
       40
       +
         __structuredAttrs = true;

     

       41
       41
       +
         strictDeps = true;

     

       42
       42
       +
       

     

       43
       43
       +
         osg' = (openscenegraph.override { colladaSupport = true; }).overrideAttrs (oldAttrs: {

     

       44
       44
       +
           patches = (oldAttrs.patches or [ ]) ++ [

     

       45
       45
       +
             (fetchpatch {

     

       46
       46
       +
               # Darwin: Without this patch, OSG won't build osgdb_png.so, which is required by OpenMW.

     

       47
       47
       +
               name = "darwin-osg-plugins-fix.patch";

     

       48
       48
       +
               url = "https://gitlab.com/OpenMW/openmw-dep/-/raw/1305497c009dc0e7a6a70fe14f0a2f92b96cbcb4/macos/osg.patch";

     

       49
       49
       +
               hash = "sha256-G8Y+fnR6FRGxECWrei/Ixch3A3PkRfH6b5q9iawsSCY=";

     

       50
       50
       +
             })

     

       51
       51
       +
           ];

     

       52
       52
       +
           cmakeFlags =

     

       53
       53
       +
             (oldAttrs.cmakeFlags or [ ])

     

       54
       54
       +
             ++ [

     

       55
       55
       +
               "-Wno-dev"

     

       56
       56
       +
               (lib.cmakeFeature "OpenGL_GL_PREFERENCE" GLPreference)

     

       57
       57
       +
               (lib.cmakeBool "BUILD_OSG_PLUGINS_BY_DEFAULT" false)

     

       58
       58
       +
               (lib.cmakeBool "BUILD_OSG_DEPRECATED_SERIALIZERS" false)

     

       59
       59
       +
             ]

     

       60
       60
       +
             ++ (map (plugin: lib.cmakeBool "BUILD_OSG_PLUGIN_${plugin}" true) [

     

       61
       61
       +
               "BMP"

     

       62
       62
       +
               "DAE"

     

       63
       63
       +
               "DDS"

     

       64
       64
       +
               "FREETYPE"

     

       65
       65
       +
               "JPEG"

     

       66
       66
       +
               "OSG"

     

       67
       67
       +
               "PNG"

     

       68
       68
       +
               "TGA"

     

       69
       69
       +
             ]);

     

       70
       70
       +
         });

     

       71
       71
       +
       

     

       72
       72
       +
         bullet' = bullet.overrideAttrs (oldAttrs: {

     

       73
       73
       +
           cmakeFlags = (oldAttrs.cmakeFlags or [ ]) ++ [

     

       74
       74
       +
             "-Wno-dev"

     

       75
       75
       +
             (lib.cmakeFeature "OpenGL_GL_PREFERENCE" GLPreference)

     

       76
       76
       +
             (lib.cmakeBool "USE_DOUBLE_PRECISION" true)

     

       77
       77
       +
             (lib.cmakeBool "BULLET2_MULTITHREADING" true)

     

       78
       78
       +
           ];

     

       79
       79
       +
         });

     

       80
       80
       +
       

     

       81
       81
       +
         src = fetchFromGitLab {

     

       82
       82
       +
           owner = "OpenMW";

     

       83
       83
       +
           repo = "openmw";

     

       84
       84
       +
           tag = "openmw-${finalAttrs.version}";

     

       85
       85
       +
           hash = "sha256-Eyjn3jPpo0d7XENg0Ea/3MN60lZBSUAMkz1UtTiIP80=";

     

       86
       86
       +
         };

     

       87
       87
       +
       

     

       88
       88
       +
         postPatch = ''

     

       89
       89
       +
           sed '1i#include <memory>' -i components/myguiplatform/myguidatamanager.cpp # gcc12

     

       90
       90
       +
         ''

     

       91
       91
       +
         # Don't fix Darwin app bundle

     

       92
       92
       +
         + lib.optionalString isDarwin ''

     

       93
       93
       +
           sed -i '/fixup_bundle/d' CMakeLists.txt

     

       94
       94
       +
         '';

     

       95
       95
       +
       

     

       96
       96
       +
         nativeBuildInputs = [

     

       97
       97
       +
           cmake

     

       98
       98
       +
           pkg-config

     

       99
       99
       +
         ]

     

       100
       100
       +
         ++ (with qt6Packages; [

     

       101
       101
       +
           wrapQtAppsHook

     

       102
       102
       +
         ]);

     

       103
       103
       +
       

     

       104
       104
       +
         # If not set, OSG plugin .so files become shell scripts on Darwin.

     

       105
       105
       +
         dontWrapQtApps = isDarwin;

     

       106
       106
       +
       

     

       107
       107
       +
         buildInputs = [

     

       108
       108
       +
           SDL2

     

       109
       109
       +
           boost

     

       110
       110
       +
           collada-dom

     

       111
       111
       +
           ffmpeg

     

       112
       112
       +
           libXt

     

       113
       113
       +
           (if isAarch64Linux then lua else luajit)

     

       114
       114
       +
           lz4

     

       115
       115
       +
           mygui

     

       116
       116
       +
           openal

     

       117
       117
       +
           recastnavigation

     

       118
       118
       +
           unshield

     

       119
       119
       +
           yaml-cpp

     

       120
       120
       +
         ]

     

       121
       121
       +
         ++ (with qt6Packages; [

     

       122
       122
       +
           qttools

     

       123
       123
       +
         ])

     

       124
       124
       +
         ++ (with finalAttrs; [

     

       125
       125
       +
           bullet'

     

       126
       126
       +
           osg'

     

       127
       127
       +
         ]);

     

       128
       128
       +
       

     

       129
       129
       +
         cmakeFlags = [

     

       130
       130
       +
           (lib.cmakeFeature "OpenGL_GL_PREFERENCE" GLPreference)

     

       131
       131
       +
           (lib.cmakeBool "USE_LUAJIT" (!isAarch64Linux))

     

       132
       132
       +
           (lib.cmakeBool "OPENMW_USE_SYSTEM_RECASTNAVIGATION" true)

     

       133
       133
       +
           (lib.cmakeBool "OPENMW_OSX_DEPLOYMENT" isDarwin)

     

       134
       134
       +
         ];

     

       135
       135
       +
       

     

       136
       136
       +
         meta = {

     

       137
       137
       +
           description = "Unofficial open source engine reimplementation of the game Morrowind";

     

       138
       138
       +
           changelog = "https://gitlab.com/OpenMW/openmw/-/blob/${finalAttrs.src.tag}/CHANGELOG.md";

     

       139
       139
       +
           homepage = "https://openmw.org";

     

       140
       140
       +
           license = lib.licenses.gpl3Plus;

     

       141
       141
       +
           maintainers = with lib.maintainers; [

     

       142
       142
       +
             marius851000

     

       143
       143
       +
             sigmasquadron

     

       144
       144
       +
           ];

     

       145
       145
       +
           platforms = with lib.platforms; linux ++ darwin ++ windows;

     

       146
       146
       +
           # Nixpkgs' NT infrastructure is currently incapable of building this.

     

       147
       147
       +
           badPlatforms = lib.platforms.windows;

     

       148
       148
       +
         };

     

       149
       149
       +
       })

+4 -2

pkgs/by-name/op/openscenegraph/package.nix

···

       32
       32
        
         curlSupport ? true,

     

       33
       33
        
         curl,

     

       34
       34
        
         colladaSupport ? false,

     

       35
       35
       -
         opencollada,

     

       35
       35
       +
         collada-dom,

     

       36
       36
        
         opencascadeSupport ? false,

     

       37
       37
        
         opencascade-occt,

     

       38
       38
        
         ffmpegSupport ? false,

     
···

       98
       98
        
           ++ lib.optional gdalSupport gdal

     

       99
       99
        
           ++ lib.optional curlSupport curl

     

       100
       100
        
           ++ lib.optionals colladaSupport [

     

       101
       101
       -
             opencollada

     

       101
       101
       +
             collada-dom

     

       102
       102
        
             pcre

     

       103
       103
        
           ]

     

       104
       104
        
           ++ lib.optional opencascadeSupport opencascade-occt

     
···

       114
       114
        
           ++ lib.optional restSupport asio

     

       115
       115
        
           ++ lib.optionals withExamples [ fltk ]

     

       116
       116
        
           ++ lib.optional (restSupport || colladaSupport) boost;

     

       117
       117
       +
       

     

       118
       118
       +
         env = lib.optionalAttrs colladaSupport { COLLADA_DIR = collada-dom; };

     

       117
       119
        
       

     

       118
       120
        
         patches = [

     

       119
       121
        
           (fetchpatch {

-41

pkgs/games/openmw/0001-function-inclusion-fixes-for-gcc14.patch

···

       1
       1
       -
       From 59f8403616e8db6dcf8f3489c44b61524044fe64 Mon Sep 17 00:00:00 2001

     

       2
       2
       -
       From: Fernando Rodrigues <alpha@sigmasquadron.net>

     

       3
       3
       -
       Date: Thu, 2 Jan 2025 04:28:42 +0000

     

       4
       4
       -
       Subject: [PATCH] Function inclusion fixes for GCC 14

     

       5
       5
       -
       

     

       6
       6
       -
       This patch includes <algorithm> in bsa_file.cpp and <list> in

     

       7
       7
       -
       charactermanager.hpp to prevent a build failure with GCC 14.

     

       8
       8
       -
       

     

       9
       9
       -
       Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>

     

       10
       10
       -
       ---

     

       11
       11
       -
        apps/openmw/mwstate/charactermanager.hpp | 1 +

     

       12
       12
       -
        components/bsa/bsa_file.cpp              | 1 +

     

       13
       13
       -
        2 files changed, 2 insertions(+)

     

       14
       14
       -
       

     

       15
       15
       -
       diff --git a/apps/openmw/mwstate/charactermanager.hpp b/apps/openmw/mwstate/charactermanager.hpp

     

       16
       16
       -
       index 8b3f2b8f8f..fac73b3d44 100644

     

       17
       17
       -
       --- a/apps/openmw/mwstate/charactermanager.hpp

     

       18
       18
       -
       +++ b/apps/openmw/mwstate/charactermanager.hpp

     

       19
       19
       -
       @@ -4,6 +4,7 @@

     

       20
       20
       -
        #include <boost/filesystem/path.hpp>

     

       21
       21
       -
       

     

       22
       22
       -
        #include "character.hpp"

     

       23
       23
       -
       +#include <list>

     

       24
       24
       -
       

     

       25
       25
       -
        namespace MWState

     

       26
       26
       -
        {

     

       27
       27
       -
       diff --git a/components/bsa/bsa_file.cpp b/components/bsa/bsa_file.cpp

     

       28
       28
       -
       index 4f795ec0d4..38e97b267b 100644

     

       29
       29
       -
       --- a/components/bsa/bsa_file.cpp

     

       30
       30
       -
       +++ b/components/bsa/bsa_file.cpp

     

       31
       31
       -
       @@ -25,6 +25,7 @@

     

       32
       32
       -
       

     

       33
       33
       -
        #include <components/files/constrainedfilestream.hpp>

     

       34
       34
       -
       

     

       35
       35
       -
       +#include <algorithm>

     

       36
       36
       -
        #include <cassert>

     

       37
       37
       -
       

     

       38
       38
       -
        #include <boost/filesystem/path.hpp>

     

       39
       39
       -
       --

     

       40
       40
       -
       2.47.0

     

       41
       41
       -

-130

pkgs/games/openmw/default.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         lib,

     

       3
       3
       -
         stdenv,

     

       4
       4
       -
         fetchFromGitLab,

     

       5
       5
       -
         fetchpatch,

     

       6
       6
       -
         cmake,

     

       7
       7
       -
         pkg-config,

     

       8
       8
       -
         wrapQtAppsHook,

     

       9
       9
       -
         SDL2,

     

       10
       10
       -
         boost,

     

       11
       11
       -
         bullet,

     

       12
       12
       -
         # Please unpin this on the next OpenMW release.

     

       13
       13
       -
         ffmpeg_6,

     

       14
       14
       -
         libXt,

     

       15
       15
       -
         luajit,

     

       16
       16
       -
         lz4,

     

       17
       17
       -
         mygui,

     

       18
       18
       -
         openal,

     

       19
       19
       -
         openscenegraph,

     

       20
       20
       -
         recastnavigation,

     

       21
       21
       -
         unshield,

     

       22
       22
       -
         yaml-cpp,

     

       23
       23
       -
       }:

     

       24
       24
       -
       

     

       25
       25
       -
       let

     

       26
       26
       -
         GL = "GLVND"; # or "LEGACY";

     

       27
       27
       -
       

     

       28
       28
       -
         osg' = (openscenegraph.override { colladaSupport = true; }).overrideDerivation (old: {

     

       29
       29
       -
           patches = [

     

       30
       30
       -
             (fetchpatch {

     

       31
       31
       -
               # Darwin: Without this patch, OSG won't build osgdb_png.so, which is required by OpenMW.

     

       32
       32
       -
               name = "darwin-osg-plugins-fix.patch";

     

       33
       33
       -
               url = "https://gitlab.com/OpenMW/openmw-dep/-/raw/0abe3c9c3858211028d881d7706813d606335f72/macos/osg.patch";

     

       34
       34
       -
               sha256 = "sha256-/CLRZofZHot8juH78VG1/qhTHPhy5DoPMN+oH8hC58U=";

     

       35
       35
       -
             })

     

       36
       36
       -
           ];

     

       37
       37
       -
           cmakeFlags =

     

       38
       38
       -
             (old.cmakeFlags or [ ])

     

       39
       39
       -
             ++ [

     

       40
       40
       -
               "-Wno-dev"

     

       41
       41
       -
               "-DOpenGL_GL_PREFERENCE=${GL}"

     

       42
       42
       -
               "-DBUILD_OSG_PLUGINS_BY_DEFAULT=0"

     

       43
       43
       -
               "-DBUILD_OSG_DEPRECATED_SERIALIZERS=0"

     

       44
       44
       -
             ]

     

       45
       45
       -
             ++ (map (e: "-DBUILD_OSG_PLUGIN_${e}=1") [

     

       46
       46
       -
               "BMP"

     

       47
       47
       -
               "DAE"

     

       48
       48
       -
               "DDS"

     

       49
       49
       -
               "FREETYPE"

     

       50
       50
       -
               "JPEG"

     

       51
       51
       -
               "OSG"

     

       52
       52
       -
               "PNG"

     

       53
       53
       -
               "TGA"

     

       54
       54
       -
             ]);

     

       55
       55
       -
         });

     

       56
       56
       -
       

     

       57
       57
       -
         bullet' = bullet.overrideDerivation (old: {

     

       58
       58
       -
           cmakeFlags = (old.cmakeFlags or [ ]) ++ [

     

       59
       59
       -
             "-Wno-dev"

     

       60
       60
       -
             "-DOpenGL_GL_PREFERENCE=${GL}"

     

       61
       61
       -
             "-DUSE_DOUBLE_PRECISION=ON"

     

       62
       62
       -
             "-DBULLET2_MULTITHREADING=ON"

     

       63
       63
       -
           ];

     

       64
       64
       -
         });

     

       65
       65
       -
       

     

       66
       66
       -
       in

     

       67
       67
       -
       stdenv.mkDerivation rec {

     

       68
       68
       -
         pname = "openmw";

     

       69
       69
       -
         version = "0.48.0";

     

       70
       70
       -
       

     

       71
       71
       -
         src = fetchFromGitLab {

     

       72
       72
       -
           owner = "OpenMW";

     

       73
       73
       -
           repo = "openmw";

     

       74
       74
       -
           rev = "${pname}-${version}";

     

       75
       75
       -
           hash = "sha256-zkjVt3GfQZsFXl2Ht3lCuQtDMYQWxhdFO4aGSb3rsyo=";

     

       76
       76
       -
         };

     

       77
       77
       -
       

     

       78
       78
       -
         patches = [ ./0001-function-inclusion-fixes-for-gcc14.patch ];

     

       79
       79
       -
       

     

       80
       80
       -
         postPatch = ''

     

       81
       81
       -
           sed '1i#include <memory>' -i components/myguiplatform/myguidatamanager.cpp # gcc12

     

       82
       82
       -
         ''

     

       83
       83
       -
         + lib.optionalString stdenv.hostPlatform.isDarwin ''

     

       84
       84
       -
           # Don't fix Darwin app bundle

     

       85
       85
       -
           sed -i '/fixup_bundle/d' CMakeLists.txt

     

       86
       86
       -
         '';

     

       87
       87
       -
       

     

       88
       88
       -
         nativeBuildInputs = [

     

       89
       89
       -
           cmake

     

       90
       90
       -
           pkg-config

     

       91
       91
       -
           wrapQtAppsHook

     

       92
       92
       -
         ];

     

       93
       93
       -
       

     

       94
       94
       -
         # If not set, OSG plugin .so files become shell scripts on Darwin.

     

       95
       95
       -
         dontWrapQtApps = stdenv.hostPlatform.isDarwin;

     

       96
       96
       -
       

     

       97
       97
       -
         buildInputs = [

     

       98
       98
       -
           SDL2

     

       99
       99
       -
           boost

     

       100
       100
       -
           bullet'

     

       101
       101
       -
           ffmpeg_6

     

       102
       102
       -
           libXt

     

       103
       103
       -
           luajit

     

       104
       104
       -
           lz4

     

       105
       105
       -
           mygui

     

       106
       106
       -
           openal

     

       107
       107
       -
           osg'

     

       108
       108
       -
           recastnavigation

     

       109
       109
       -
           unshield

     

       110
       110
       -
           yaml-cpp

     

       111
       111
       -
         ];

     

       112
       112
       -
       

     

       113
       113
       -
         cmakeFlags = [

     

       114
       114
       -
           "-DOpenGL_GL_PREFERENCE=${GL}"

     

       115
       115
       -
           "-DOPENMW_USE_SYSTEM_RECASTNAVIGATION=1"

     

       116
       116
       -
         ]

     

       117
       117
       -
         ++ lib.optionals stdenv.hostPlatform.isDarwin [

     

       118
       118
       -
           "-DOPENMW_OSX_DEPLOYMENT=ON"

     

       119
       119
       -
         ];

     

       120
       120
       -
       

     

       121
       121
       -
         meta = with lib; {

     

       122
       122
       -
           description = "Unofficial open source engine reimplementation of the game Morrowind";

     

       123
       123
       -
           homepage = "https://openmw.org";

     

       124
       124
       -
           license = licenses.gpl3Plus;

     

       125
       125
       -
           maintainers = with maintainers; [

     

       126
       126
       -
             marius851000

     

       127
       127
       -
           ];

     

       128
       128
       -
           platforms = platforms.linux ++ platforms.darwin;

     

       129
       129
       -
         };

     

       130
       130
       -
       }

-25

pkgs/games/openmw/tes3mp-gcc14-fix.patch

···

       1
       1
       -
       diff --git a/apps/openmw/mwstate/charactermanager.hpp b/apps/openmw/mwstate/charactermanager.hpp

     

       2
       2
       -
       index 2daf734..b77d2a8 100644

     

       3
       3
       -
       --- a/apps/openmw/mwstate/charactermanager.hpp

     

       4
       4
       -
       +++ b/apps/openmw/mwstate/charactermanager.hpp

     

       5
       5
       -
       @@ -1,6 +1,8 @@

     

       6
       6
       -
        #ifndef GAME_STATE_CHARACTERMANAGER_H

     

       7
       7
       -
        #define GAME_STATE_CHARACTERMANAGER_H

     

       8
       8
       -
        

     

       9
       9
       -
       +#include <list>

     

       10
       10
       -
       +

     

       11
       11
       -
        #include <boost/filesystem/path.hpp>

     

       12
       12
       -
        

     

       13
       13
       -
        #include "character.hpp"

     

       14
       14
       -
       diff --git a/components/vfs/filesystemarchive.cpp b/components/vfs/filesystemarchive.cpp

     

       15
       15
       -
       index 6eef4b9..608323e 100644

     

       16
       16
       -
       --- a/components/vfs/filesystemarchive.cpp

     

       17
       17
       -
       +++ b/components/vfs/filesystemarchive.cpp

     

       18
       18
       -
       @@ -1,5 +1,7 @@

     

       19
       19
       -
        #include "filesystemarchive.hpp"

     

       20
       20
       -
        

     

       21
       21
       -
       +#include <algorithm>

     

       22
       22
       -
       +

     

       23
       23
       -
        #include <boost/filesystem.hpp>

     

       24
       24
       -
        

     

       25
       25
       -
        #include <components/debug/debuglog.hpp>

-179

pkgs/games/openmw/tes3mp.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         lib,

     

       3
       3
       -
         stdenv,

     

       4
       4
       -
         cmake,

     

       5
       5
       -
         openmw,

     

       6
       6
       -
         fetchFromGitHub,

     

       7
       7
       -
         fetchpatch,

     

       8
       8
       -
         luajit,

     

       9
       9
       -
         makeWrapper,

     

       10
       10
       -
         symlinkJoin,

     

       11
       11
       -
       }:

     

       12
       12
       -
       

     

       13
       13
       -
       # revisions are taken from https://github.com/GrimKriegor/TES3MP-deploy

     

       14
       14
       -
       

     

       15
       15
       -
       let

     

       16
       16
       -
         # raknet could also be split into dev and lib outputs

     

       17
       17
       -
         raknet = stdenv.mkDerivation {

     

       18
       18
       -
           pname = "raknet";

     

       19
       19
       -
           version = "unstable-2020-01-19";

     

       20
       20
       -
       

     

       21
       21
       -
           src = fetchFromGitHub {

     

       22
       22
       -
             owner = "TES3MP";

     

       23
       23
       -
             repo = "CrabNet";

     

       24
       24
       -
             # usually fixed:

     

       25
       25
       -
             # https://github.com/GrimKriegor/TES3MP-deploy/blob/d2a4a5d3acb64b16d9b8ca85906780aeea8d311b/tes3mp-deploy.sh#L589

     

       26
       26
       -
             rev = "19e66190e83f53bcdcbcd6513238ed2e54878a21";

     

       27
       27
       -
             sha256 = "WIaJkSQnoOm9T7GoAwmWl7fNg79coIo/ILUsWcbH+lA=";

     

       28
       28
       -
           };

     

       29
       29
       -
       

     

       30
       30
       -
           patches = [

     

       31
       31
       -
             # gcc-13 build fix:

     

       32
       32
       -
             #   https://github.com/TES3MP/CrabNet/pull/18

     

       33
       33
       -
             (fetchpatch {

     

       34
       34
       -
               name = "gcc-13.patch";

     

       35
       35
       -
               url = "https://github.com/TES3MP/CrabNet/commit/3ec9a338a7cefd5cc751c9d29095cafa4c73be20.patch";

     

       36
       36
       -
               hash = "sha256-zE87icjX9GSnApgKQXj0K4IjlrReV/upFLjVgNYkNfM=";

     

       37
       37
       -
             })

     

       38
       38
       -
           ];

     

       39
       39
       -
       

     

       40
       40
       -
           cmakeFlags = [

     

       41
       41
       -
             "-DCRABNET_ENABLE_DLL=OFF"

     

       42
       42
       -
           ];

     

       43
       43
       -
       

     

       44
       44
       -
           nativeBuildInputs = [ cmake ];

     

       45
       45
       -
       

     

       46
       46
       -
           installPhase = ''

     

       47
       47
       -
             install -Dm555 lib/libRakNetLibStatic.a $out/lib/libRakNetLibStatic.a

     

       48
       48
       -
           '';

     

       49
       49
       -
         };

     

       50
       50
       -
       

     

       51
       51
       -
         coreScripts = stdenv.mkDerivation {

     

       52
       52
       -
           pname = "corescripts";

     

       53
       53
       -
           version = "0.8.1";

     

       54
       54
       -
       

     

       55
       55
       -
           src = fetchFromGitHub {

     

       56
       56
       -
             owner = "TES3MP";

     

       57
       57
       -
             repo = "CoreScripts";

     

       58
       58
       -
             # usually latest in stable branch (e.g. 0.7.1)

     

       59
       59
       -
             rev = "6ae0a2a5d16171de3764817a7f8b1067ecde3def";

     

       60
       60
       -
             sha256 = "8j/Sr9IRMNFPEVfFzdb42PckHS3KW7FH7x7rRxIh5gY=";

     

       61
       61
       -
           };

     

       62
       62
       -
       

     

       63
       63
       -
           buildCommand = ''

     

       64
       64
       -
             dir=$out/share/openmw-tes3mp

     

       65
       65
       -
             mkdir -p $dir

     

       66
       66
       -
             cp -r $src $dir/CoreScripts

     

       67
       67
       -
           '';

     

       68
       68
       -
         };

     

       69
       69
       -
       

     

       70
       70
       -
         # build an unwrapped version so we don't have to rebuild it all over again in

     

       71
       71
       -
         # case the scripts or wrapper scripts change.

     

       72
       72
       -
         unwrapped = openmw.overrideAttrs (oldAttrs: rec {

     

       73
       73
       -
           pname = "openmw-tes3mp-unwrapped";

     

       74
       74
       -
           version = "0.8.1";

     

       75
       75
       -
       

     

       76
       76
       -
           src = fetchFromGitHub {

     

       77
       77
       -
             owner = "TES3MP";

     

       78
       78
       -
             repo = "TES3MP";

     

       79
       79
       -
             # usually latest in stable branch (e.g. 0.7.1)

     

       80
       80
       -
             rev = "68954091c54d0596037c4fb54d2812313b7582a1";

     

       81
       81
       -
             sha256 = "8/bV4sw7Q8l8bDTHGQ0t4owf6J6h9q468JFx4KegY5o=";

     

       82
       82
       -
           };

     

       83
       83
       -
       

     

       84
       84
       -
           nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ makeWrapper ];

     

       85
       85
       -
       

     

       86
       86
       -
           buildInputs = oldAttrs.buildInputs ++ [ luajit ];

     

       87
       87
       -
       

     

       88
       88
       -
           cmakeFlags = oldAttrs.cmakeFlags ++ [

     

       89
       89
       -
             "-DBUILD_OPENCS=OFF"

     

       90
       90
       -
             "-DRakNet_INCLUDES=${raknet.src}/include"

     

       91
       91
       -
             "-DRakNet_LIBRARY_RELEASE=${raknet}/lib/libRakNetLibStatic.a"

     

       92
       92
       -
             "-DRakNet_LIBRARY_DEBUG=${raknet}/lib/libRakNetLibStatic.a"

     

       93
       93
       -
           ];

     

       94
       94
       -
       

     

       95
       95
       -
           prePatch = ''

     

       96
       96
       -
             substituteInPlace components/process/processinvoker.cpp \

     

       97
       97
       -
               --replace "\"./\"" "\"$out/bin/\""

     

       98
       98
       -
           '';

     

       99
       99
       -
       

     

       100
       100
       -
           patches = [

     

       101
       101
       -
             # glibc-2.34 support

     

       102
       102
       -
             (fetchpatch {

     

       103
       103
       -
               url = "https://gitlab.com/OpenMW/openmw/-/commit/98a7d90ee258ceef9c70b0b2955d0458ec46f048.patch";

     

       104
       104
       -
               hash = "sha256-RhbIGeE6GyqnipisiMTwWjcFnIiR055hUPL8IkjPgZw=";

     

       105
       105
       -
             })

     

       106
       106
       -
       

     

       107
       107
       -
             # gcc-13 build fix:

     

       108
       108
       -
             #   https://github.com/TES3MP/TES3MP/pull/674

     

       109
       109
       -
             (fetchpatch {

     

       110
       110
       -
               name = "gcc-13.patch";

     

       111
       111
       -
               url = "https://github.com/TES3MP/TES3MP/commit/7921f71a79e96f817a2009100e5105a7948b3fe2.patch";

     

       112
       112
       -
               hash = "sha256-mpxuOSPA2xixgBeYXsxutEUI7VJL5PxAeZgaNU7YkJQ=";

     

       113
       113
       -
             })

     

       114
       114
       -
       

     

       115
       115
       -
             # https://github.com/TES3MP/openmw-tes3mp/issues/552

     

       116
       116
       -
             ./tes3mp.patch

     

       117
       117
       -
       

     

       118
       118
       -
             # https://github.com/TES3MP/TES3MP/pull/691

     

       119
       119
       -
             ./tes3mp-gcc14-fix.patch

     

       120
       120
       -
           ];

     

       121
       121
       -
       

     

       122
       122
       -
           env.NIX_CFLAGS_COMPILE = "-fpermissive";

     

       123
       123
       -
       

     

       124
       124
       -
           preConfigure = ''

     

       125
       125
       -
             substituteInPlace files/version.in \

     

       126
       126
       -
               --subst-var-by OPENMW_VERSION_COMMITHASH ${src.rev}

     

       127
       127
       -
           '';

     

       128
       128
       -
       

     

       129
       129
       -
           # move everything that we wrap out of the way

     

       130
       130
       -
           postInstall = ''

     

       131
       131
       -
             mkdir -p $out/libexec

     

       132
       132
       -
             mv $out/bin/tes3mp-* $out/libexec

     

       133
       133
       -
           '';

     

       134
       134
       -
       

     

       135
       135
       -
           meta = with lib; {

     

       136
       136
       -
             description = "Multiplayer for TES3:Morrowind based on OpenMW";

     

       137
       137
       -
             homepage = "https://tes3mp.com/";

     

       138
       138
       -
             license = licenses.gpl3Only;

     

       139
       139
       -
             maintainers = with maintainers; [ peterhoeg ];

     

       140
       140
       -
             platforms = [

     

       141
       141
       -
               "x86_64-linux"

     

       142
       142
       -
               "i686-linux"

     

       143
       143
       -
             ];

     

       144
       144
       -
           };

     

       145
       145
       -
         });

     

       146
       146
       -
       

     

       147
       147
       -
         tes3mp-server-run = ''

     

       148
       148
       -
           config="''${XDG_CONFIG_HOME:-''$HOME/.config}"/openmw

     

       149
       149
       -
           data="''${XDG_DATA_HOME:-''$HOME/.local/share}"/openmw

     

       150
       150
       -
           if [[ ! -f "$config"/tes3mp-server.cfg && ! -d "$data"/server ]]; then

     

       151
       151
       -
             mkdir -p "$config"

     

       152
       152
       -
             echo [Plugins] > "$config"/tes3mp-server.cfg

     

       153
       153
       -
             echo "home = $data/server" >> "$config"/tes3mp-server.cfg

     

       154
       154
       -
             mkdir -p "$data"

     

       155
       155
       -
             cp -r ${coreScripts}/share/openmw-tes3mp/CoreScripts "$data"/server

     

       156
       156
       -
             chmod -R u+w "$data"/server

     

       157
       157
       -
           fi

     

       158
       158
       -
         '';

     

       159
       159
       -
       

     

       160
       160
       -
       in

     

       161
       161
       -
       symlinkJoin {

     

       162
       162
       -
         name = "openmw-tes3mp-${unwrapped.version}";

     

       163
       163
       -
         inherit (unwrapped) version meta;

     

       164
       164
       -
       

     

       165
       165
       -
         nativeBuildInputs = [ makeWrapper ];

     

       166
       166
       -
       

     

       167
       167
       -
         paths = [ unwrapped ];

     

       168
       168
       -
       

     

       169
       169
       -
         postBuild = ''

     

       170
       170
       -
           mkdir -p $out/bin

     

       171
       171
       -
       

     

       172
       172
       -
           makeWrapper ${unwrapped}/libexec/tes3mp-browser $out/bin/tes3mp-browser \

     

       173
       173
       -
             --chdir "$out/bin"

     

       174
       174
       -
       

     

       175
       175
       -
           makeWrapper ${unwrapped}/libexec/tes3mp-server $out/bin/tes3mp-server \

     

       176
       176
       -
             --run '${tes3mp-server-run}' \

     

       177
       177
       -
             --chdir "$out/bin"

     

       178
       178
       -
         '';

     

       179
       179
       -
       }

-13

pkgs/games/openmw/tes3mp.patch

···

       1
       1
       -
       diff --git a/apps/openmw-mp/Script/Types.hpp b/apps/openmw-mp/Script/Types.hpp

     

       2
       2
       -
       index be365cfb8..204dcdc7b 100644

     

       3
       3
       -
       --- a/apps/openmw-mp/Script/Types.hpp

     

       4
       4
       -
       +++ b/apps/openmw-mp/Script/Types.hpp

     

       5
       5
       -
       @@ -105,7 +105,7 @@ struct ScriptFunctionPointer : public ScriptIdentity

     

       6
       6
       -
            void *addr;

     

       7
       7
       -
        #if (!defined(__clang__) && defined(__GNUC__))

     

       8
       8
       -
            template<typename R, typename... Types>

     

       9
       9
       -
       -    constexpr ScriptFunctionPointer(Function<R, Types...> addr) : ScriptIdentity(addr), addr((void*)(addr)) {}

     

       10
       10
       -
       +    constexpr ScriptFunctionPointer(Function<R, Types...> addr) : ScriptIdentity(addr), addr(addr) {}

     

       11
       11
       -
        #else

     

       12
       12
       -
            template<typename R, typename... Types>

     

       13
       13
       -
            constexpr ScriptFunctionPointer(Function<R, Types...> addr) : ScriptIdentity(addr), addr(addr) {}

+1 -1

pkgs/top-level/aliases.nix

···

       633
       633
        
         code-browser-gtk = throw "'code-browser-gtk' has been removed, as it was broken since 22.11"; # Added 2025-08-22

     

       634
       634
        
         code-browser-gtk2 = throw "'code-browser-gtk2' has been removed, as it was broken since 22.11"; # Added 2025-08-22

     

       635
       635
        
         code-browser-qt = throw "'code-browser-qt' has been removed, as it was broken since 22.11"; # Added 2025-08-22

     

       636
       636
       -
         collada-dom = opencollada; # added 2024-02-21

     

       637
       636
        
         collada2gltf = throw "collada2gltf has been removed from Nixpkgs, as it has been unmaintained upstream for 5 years and does not build with supported GCC versions"; # Addd 2025-08-08

     

       638
       637
        
         colloid-kde = throw "'colloid-kde' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20

     

       639
       638
        
         colorpicker = throw "'colorpicker' has been removed due to lack of maintenance upstream. Consider using 'xcolor', 'gcolor3', 'eyedropper' or 'gpick' instead"; # Added 2024-10-19

     
···

       1829
       1828
        
         openlens = throw "Lens Closed its source code, package obsolete/stale - consider lens as replacement"; # Added 2024-09-04

     

       1830
       1829
        
         openlp = throw "openlp has been removed for now because the outdated version depended on insecure and removed packages and it needs help to upgrade and maintain it; see https://github.com/NixOS/nixpkgs/pull/314882"; # Added 2024-07-29

     

       1831
       1830
        
         openmpt123 = throw "'openmpt123' has been renamed to/replaced by 'libopenmpt'"; # Converted to throw 2024-10-17

     

       1831
       1831
       +
         openmw-tes3mp = throw "'openmw-tes3mp' has been removed due to lack of maintenance upstream"; # Added 2025-08-30

     

       1832
       1832
        
         opensmtpd-extras = throw "opensmtpd-extras has been removed in favor of separate opensmtpd-table-* packages"; # Added 2025-01-26

     

       1833
       1833
        
         openssl_3_0 = openssl_3; # Added 2022-06-27

     

       1834
       1834
        
         opensycl = lib.warnOnInstantiate "'opensycl' has been renamed to 'adaptivecpp'" adaptivecpp; # Added 2024-12-04

-4

pkgs/top-level/all-packages.nix

···

       14052
       14052
        
       

     

       14053
       14053
        
         openloco = pkgsi686Linux.callPackage ../games/openloco { };

     

       14054
       14054
        
       

     

       14055
       14055
       -
         openmw = libsForQt5.callPackage ../games/openmw { };

     

       14056
       14056
       -
       

     

       14057
       14057
       -
         openmw-tes3mp = libsForQt5.callPackage ../games/openmw/tes3mp.nix { };

     

       14058
       14058
       -
       

     

       14059
       14055
        
         openraPackages_2019 = import ../games/openra_2019 {

     

       14060
       14056
        
           inherit lib;

     

       14061
       14057
        
           pkgs = pkgs.__splicedPackages;