pyrox.dev
loxodo: migrate to wxPython_4_2
+3
-1
pkgs/applications/misc/loxodo/default.nix
+3
-1
pkgs/applications/misc/loxodo/default.nix
···
11
11
sha256 = "1cips4pvrqga8q1ibs23vjrf8dwan860x8jvjmc52h6qvvvv60yl";
12
12
};
13
13
14
-
propagatedBuildInputs = with python3.pkgs; [ six wxPython_4_0 ];
14
+
patches = [ ./wxpython.patch ];
15
+
16
+
propagatedBuildInputs = with python3.pkgs; [ six wxPython_4_2 ];
15
17
16
18
postInstall = ''
17
19
mv $out/bin/loxodo.py $out/bin/loxodo
+25
pkgs/applications/misc/loxodo/wxpython.patch
+25
pkgs/applications/misc/loxodo/wxpython.patch
···
1
+
diff --git a/loxodo.py b/loxodo.py
2
+
index 68ad4c8..e96bc1a 100755
3
+
--- a/loxodo.py
4
+
+++ b/loxodo.py
5
+
@@ -41,7 +41,7 @@ if len(sys.argv) > 1:
6
+
# In all other cases, use the "wx" frontend.
7
+
try:
8
+
import wx
9
+
- assert(wx.__version__.startswith('4.0.'))
10
+
+ assert(wx.__version__.startswith('4.'))
11
+
except AssertionError as e:
12
+
print('Found incompatible wxPython, the wxWidgets Python bindings: %s' % wx.__version__, file=sys.stderr)
13
+
print('Falling back to cmdline frontend.', file=sys.stderr)
14
+
diff --git a/src/frontends/wx/loxodo.py b/src/frontends/wx/loxodo.py
15
+
index bc3f509..e02c4bf 100644
16
+
--- a/src/frontends/wx/loxodo.py
17
+
+++ b/src/frontends/wx/loxodo.py
18
+
@@ -25,6 +25,7 @@ from .loadframe import LoadFrame
19
+
20
+
21
+
def main():
22
+
+ wx.SizerFlags.DisableConsistencyChecks()
23
+
app = wx.App(False)
24
+
setup_wx_locale()
25
+
mainframe = LoadFrame(None, -1, "")