summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCayetano Santos <csantosb@inventati.org>2026-03-27 12:13:08 +0100
committerCayetano Santos <csantosb@inventati.org>2026-03-29 13:36:21 +0200
commit829b7e108de9b47bc7b70bdd021fd9ca8d799e51 (patch)
treee540e8c874ab41cc2be53a8e31ee67f5e8d8eb0b
parent684b1ab60534ef75da66f6e1fa18a96c0ce1bf49 (diff)
gnu: Remove prusa-wxwidgets.
* gnu/packages/wxwidgets.scm (prusa-wxwidgets): Delete variable. * gnu/packages/patches/prusa-wxwidgets-makefile-fix.patch: Delete. * gnu/local.mk (dist_patch_DATA): Unregister it. Merges guix/guix!7516 Change-Id: Icc703e6bd75b79c9071fac59e283cb18cbe6c70a
-rw-r--r--gnu/local.mk1
-rw-r--r--gnu/packages/patches/prusa-wxwidgets-makefile-fix.patch112
-rw-r--r--gnu/packages/wxwidgets.scm33
3 files changed, 0 insertions, 146 deletions
diff --git a/gnu/local.mk b/gnu/local.mk
index d4019b94f1f..fc0a519da36 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2088,7 +2088,6 @@ dist_patch_DATA = \
2088 %D%/packages/patches/pounce-readable-checks.patch \ 2088 %D%/packages/patches/pounce-readable-checks.patch \
2089 %D%/packages/patches/procps-strtod-test.patch \ 2089 %D%/packages/patches/procps-strtod-test.patch \
2090 %D%/packages/patches/prusa-slicer-add-cmake-module.patch \ 2090 %D%/packages/patches/prusa-slicer-add-cmake-module.patch \
2091 %D%/packages/patches/prusa-wxwidgets-makefile-fix.patch \
2092 %D%/packages/patches/pthreadpool-system-libraries.patch \ 2091 %D%/packages/patches/pthreadpool-system-libraries.patch \
2093 %D%/packages/patches/python-3.11-fix-tests.patch \ 2092 %D%/packages/patches/python-3.11-fix-tests.patch \
2094 %D%/packages/patches/python-3.12-fix-tests.patch \ 2093 %D%/packages/patches/python-3.12-fix-tests.patch \
diff --git a/gnu/packages/patches/prusa-wxwidgets-makefile-fix.patch b/gnu/packages/patches/prusa-wxwidgets-makefile-fix.patch
deleted file mode 100644
index aadf9765882..00000000000
--- a/gnu/packages/patches/prusa-wxwidgets-makefile-fix.patch
+++ /dev/null
@@ -1,112 +0,0 @@
1diff --git a/Makefile.in b/Makefile.in
2index 8f33aa2ff4..39928382da 100644
3--- a/Makefile.in
4+++ b/Makefile.in
5@@ -4358,7 +4358,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS = \
6 monodll_msw_utils.o \
7 monodll_utilsexc.o \
8 monodll_fswatcher.o \
9- monodll_msw_secretstore.o
10+ monodll_msw_secretstore.o \
11 monodll_msw_uilocale.o
12 @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS)
13 @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS \
14@@ -5284,7 +5284,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS = \
15 monodll_uuid.o \
16 monodll_msw_evtloop.o \
17 monodll_access.o \
18- monodll_dark_mode.o
19+ monodll_dark_mode.o \
20 monodll_msw_bmpbndl.o
21 @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS)
22 @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS = \
23@@ -6196,7 +6196,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1 = \
24 monodll_uuid.o \
25 monodll_msw_evtloop.o \
26 monodll_access.o \
27- monodll_dark_mode.o
28+ monodll_dark_mode.o \
29 monodll_msw_bmpbndl.o
30 @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1)
31 @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_1 = \
32@@ -6371,7 +6371,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1 = \
33 monolib_msw_utils.o \
34 monolib_utilsexc.o \
35 monolib_fswatcher.o \
36- monolib_msw_secretstore.o
37+ monolib_msw_secretstore.o \
38 monolib_msw_uilocale.o
39 @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_1 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1)
40 @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1 \
41@@ -7297,7 +7297,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2 = \
42 monolib_uuid.o \
43 monolib_msw_evtloop.o \
44 monolib_access.o \
45- monolib_dark_mode.o
46+ monolib_dark_mode.o \
47 monolib_msw_bmpbndl.o
48 @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_2 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2)
49 @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_2 = \
50@@ -8209,7 +8209,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3 = \
51 monolib_uuid.o \
52 monolib_msw_evtloop.o \
53 monolib_access.o \
54- monolib_dark_mode.o
55+ monolib_dark_mode.o \
56 monolib_msw_bmpbndl.o
57 @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3)
58 @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_3 = \
59@@ -8436,7 +8436,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2 = \
60 basedll_msw_utils.o \
61 basedll_utilsexc.o \
62 basedll_fswatcher.o \
63- basedll_msw_secretstore.o
64+ basedll_msw_secretstore.o \
65 basedll_msw_uilocale.o
66 @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_2 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2)
67 @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2 \
68@@ -8523,7 +8523,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3 = \
69 baselib_msw_utils.o \
70 baselib_utilsexc.o \
71 baselib_fswatcher.o \
72- baselib_msw_secretstore.o
73+ baselib_msw_secretstore.o \
74 baselib_msw_uilocale.o
75 @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_3 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3)
76 @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3 \
77@@ -9464,7 +9464,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4 = \
78 coredll_uuid.o \
79 coredll_msw_evtloop.o \
80 coredll_access.o \
81- coredll_dark_mode.o
82+ coredll_dark_mode.o \
83 coredll_msw_bmpbndl.o
84 @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_4 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4)
85 @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_4 = \
86@@ -10376,7 +10376,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5 = \
87 coredll_uuid.o \
88 coredll_msw_evtloop.o \
89 coredll_access.o \
90- coredll_dark_mode.o
91+ coredll_dark_mode.o \
92 coredll_msw_bmpbndl.o
93 @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_5 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5)
94 @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_5 = \
95@@ -11204,7 +11204,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6 = \
96 corelib_uuid.o \
97 corelib_msw_evtloop.o \
98 corelib_access.o \
99- corelib_dark_mode.o
100+ corelib_dark_mode.o \
101 corelib_msw_bmpbndl.o
102 @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_6 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6)
103 @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_6 = \
104@@ -12116,7 +12116,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7 = \
105 corelib_uuid.o \
106 corelib_msw_evtloop.o \
107 corelib_access.o \
108- corelib_dark_mode.o
109+ corelib_dark_mode.o \
110 corelib_msw_bmpbndl.o
111 @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7)
112 @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_7 = \
diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm
index 7d716a1a07f..d8990a5b0eb 100644
--- a/gnu/packages/wxwidgets.scm
+++ b/gnu/packages/wxwidgets.scm
@@ -242,39 +242,6 @@ and many other languages.")
242 (substitute* "src/unix/mimetype.cpp" 242 (substitute* "src/unix/mimetype.cpp"
243 (("/usr(/local)?/share/mime") mime)))))))))) 243 (("/usr(/local)?/share/mime") mime))))))))))
244 244
245(define-public prusa-wxwidgets
246 ;; There is no proper tag/release, all patches are in separate branches based on
247 ;; the wxWidgets release (e.g. this commit is taken from "v3.2.0-patched" branch".)
248 (let ((commit "78aa2dc0ea7ce99dc19adc1140f74c3e2e3f3a26")
249 (revision "0"))
250 (package
251 (inherit wxwidgets-sans-egl)
252 (name "prusa-wxwidgets")
253 (version (git-version "3.2.0" revision commit))
254 (home-page "https://github.com/prusa3d/wxWidgets")
255 (source
256 (origin
257 (method git-fetch)
258 (uri (git-reference
259 (url home-page)
260 (commit commit)))
261 (file-name (git-file-name name version))
262 ;; The patch is taken from the NixOS nixpkgs repository (see
263 ;; <https://github.com/NixOS/nixpkgs/commit/0e724ac89f3dbf6ed31d647290a371b44a85e5ad>.)
264 (patches (search-patches "prusa-wxwidgets-makefile-fix.patch"))
265 (sha256
266 (base32
267 "1xk6w7q4xv4cj906xa5dwam5q51mc8bszbkkz7l8d3wjmsz73rwv"))))
268 (native-inputs (modify-inputs native-inputs
269 (prepend nanosvg)))
270 (arguments
271 (substitute-keyword-arguments arguments
272 ((#:phases phases)
273 #~(modify-phases #$phases
274 (add-after 'unpack 'copy-nanosvg-source
275 (lambda _
276 (copy-recursively #$(package-source nanosvg) "3rdparty/nanosvg/"))))))))))
277
278(define-public python-wxpython 245(define-public python-wxpython
279 (package 246 (package
280 (name "python-wxpython") 247 (name "python-wxpython")