pyrox.dev
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 <alpha@sigmasquadron.net>
-20
pkgs/by-name/my/mygui/disable-framework.patch
-20
pkgs/by-name/my/mygui/disable-framework.patch
···
1
-
diff --git a/CMake/Utils/MyGUIConfigTargets.cmake b/CMake/Utils/MyGUIConfigTargets.cmake
2
-
index 7e279c986..b33f097c0 100644
3
-
--- a/CMake/Utils/MyGUIConfigTargets.cmake
4
-
+++ b/CMake/Utils/MyGUIConfigTargets.cmake
5
-
@@ -418,15 +418,6 @@ function(mygui_config_lib PROJECTNAME)
6
-
if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "Intel")
7
-
# add GCC visibility flags to shared library build
8
-
set_target_properties(${PROJECTNAME} PROPERTIES COMPILE_FLAGS "${MYGUI_GCC_VISIBILITY_FLAGS}")
9
-
- if (APPLE)
10
-
- # deal with Mac OS X's framework system
11
-
- set_target_properties(${PROJECTNAME} PROPERTIES FRAMEWORK TRUE)
12
-
- set_target_properties(${PROJECTNAME} PROPERTIES PUBLIC_HEADER "${${PROJECTNAME}_HEADERS}")
13
-
- set_target_properties(${PROJECTNAME} PROPERTIES OUTPUT_NAME ${PROJECTNAME})
14
-
- set_target_properties(${PROJECTNAME} PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE)
15
-
- set_target_properties(${PROJECTNAME} PROPERTIES BUILD_WITH_INSTALL_NAME_DIR TRUE)
16
-
- set_target_properties(${PROJECTNAME} PROPERTIES INSTALL_NAME_DIR "@executable_path/../lib")
17
-
- endif (APPLE)
18
-
endif ()
19
-
endif (MYGUI_STATIC)
20
-
mygui_install_target(${PROJECTNAME} "")
+9
-3
pkgs/by-name/my/mygui/package.nix
+9
-3
pkgs/by-name/my/mygui/package.nix
···
2
2
lib,
3
3
stdenv,
4
4
fetchFromGitHub,
5
+
fetchpatch,
5
6
cmake,
6
7
pkg-config,
7
8
boost,
···
20
21
in
21
22
stdenv.mkDerivation rec {
22
23
pname = "mygui";
23
-
version = "3.4.2";
24
+
version = "3.4.3";
24
25
25
26
src = fetchFromGitHub {
26
27
owner = "MyGUI";
27
28
repo = "mygui";
28
29
rev = "MyGUI${version}";
29
-
hash = "sha256-yBV0ImOFJlqBPqqOjXYe4SFO2liSGZCEwvehED5Ubj4=";
30
+
hash = "sha256-qif9trHgtWpYiDVXY3cjRsXypjjjgStX8tSWCnXhXlk=";
30
31
};
31
32
32
33
patches = [
33
-
./disable-framework.patch
34
+
(fetchpatch {
35
+
name = "darwin-mygui-framework-fix.patch";
36
+
url = "https://gitlab.com/OpenMW/openmw-dep/-/raw/ade30e6e98c051ac2a505f6984518f5f41fa87a5/macos/mygui.patch";
37
+
sha256 = "sha256-Tk+O4TFgPZOqWAY4c0Q69bZfvIB34wN9e7h0tXhLULU=";
38
+
})
34
39
];
35
40
36
41
nativeBuildInputs = [
···
60
65
"-DMYGUI_BUILD_TOOLS=OFF"
61
66
"-DMYGUI_BUILD_DEMOS=OFF"
62
67
"-DMYGUI_RENDERSYSTEM=${renderSystem}"
68
+
"-DMYGUI_DONT_USE_OBSOLETE=ON"
63
69
];
64
70
65
71
meta = with lib; {