From 9a7dd538d01b530d00738101ae409246ef1da3e9 Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Fri, 4 Jul 2025 23:23:49 +0000 Subject: [PATCH] mygui: 3.4.2 -> 3.4.3 We're now using the Darwin framework patch from OpenMW instead of vendoring it here. It's the same patch, but fetchpatch saves us a few bytes. Signed-off-by: Fernando Rodrigues --- pkgs/by-name/my/mygui/disable-framework.patch | 20 ------------------- pkgs/by-name/my/mygui/package.nix | 12 ++++++++--- 2 files changed, 9 insertions(+), 23 deletions(-) delete mode 100644 pkgs/by-name/my/mygui/disable-framework.patch diff --git a/pkgs/by-name/my/mygui/disable-framework.patch b/pkgs/by-name/my/mygui/disable-framework.patch deleted file mode 100644 index d497c862ac8a..000000000000 --- a/pkgs/by-name/my/mygui/disable-framework.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/CMake/Utils/MyGUIConfigTargets.cmake b/CMake/Utils/MyGUIConfigTargets.cmake -index 7e279c986..b33f097c0 100644 ---- a/CMake/Utils/MyGUIConfigTargets.cmake -+++ b/CMake/Utils/MyGUIConfigTargets.cmake -@@ -418,15 +418,6 @@ function(mygui_config_lib PROJECTNAME) - if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "Intel") - # add GCC visibility flags to shared library build - set_target_properties(${PROJECTNAME} PROPERTIES COMPILE_FLAGS "${MYGUI_GCC_VISIBILITY_FLAGS}") -- if (APPLE) -- # deal with Mac OS X's framework system -- set_target_properties(${PROJECTNAME} PROPERTIES FRAMEWORK TRUE) -- set_target_properties(${PROJECTNAME} PROPERTIES PUBLIC_HEADER "${${PROJECTNAME}_HEADERS}") -- set_target_properties(${PROJECTNAME} PROPERTIES OUTPUT_NAME ${PROJECTNAME}) -- set_target_properties(${PROJECTNAME} PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE) -- set_target_properties(${PROJECTNAME} PROPERTIES BUILD_WITH_INSTALL_NAME_DIR TRUE) -- set_target_properties(${PROJECTNAME} PROPERTIES INSTALL_NAME_DIR "@executable_path/../lib") -- endif (APPLE) - endif () - endif (MYGUI_STATIC) - mygui_install_target(${PROJECTNAME} "") diff --git a/pkgs/by-name/my/mygui/package.nix b/pkgs/by-name/my/mygui/package.nix index ff1f30b0d085..90b53cb5ef6e 100644 --- a/pkgs/by-name/my/mygui/package.nix +++ b/pkgs/by-name/my/mygui/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cmake, pkg-config, boost, @@ -20,17 +21,21 @@ let in stdenv.mkDerivation rec { pname = "mygui"; - version = "3.4.2"; + version = "3.4.3"; src = fetchFromGitHub { owner = "MyGUI"; repo = "mygui"; rev = "MyGUI${version}"; - hash = "sha256-yBV0ImOFJlqBPqqOjXYe4SFO2liSGZCEwvehED5Ubj4="; + hash = "sha256-qif9trHgtWpYiDVXY3cjRsXypjjjgStX8tSWCnXhXlk="; }; patches = [ - ./disable-framework.patch + (fetchpatch { + name = "darwin-mygui-framework-fix.patch"; + url = "https://gitlab.com/OpenMW/openmw-dep/-/raw/ade30e6e98c051ac2a505f6984518f5f41fa87a5/macos/mygui.patch"; + sha256 = "sha256-Tk+O4TFgPZOqWAY4c0Q69bZfvIB34wN9e7h0tXhLULU="; + }) ]; nativeBuildInputs = [ @@ -60,6 +65,7 @@ stdenv.mkDerivation rec { "-DMYGUI_BUILD_TOOLS=OFF" "-DMYGUI_BUILD_DEMOS=OFF" "-DMYGUI_RENDERSYSTEM=${renderSystem}" + "-DMYGUI_DONT_USE_OBSOLETE=ON" ]; meta = with lib; {