diff --git a/pkgs/applications/misc/loxodo/default.nix b/pkgs/applications/misc/loxodo/default.nix index bcfd581edcf9..53ea7730cb12 100644 --- a/pkgs/applications/misc/loxodo/default.nix +++ b/pkgs/applications/misc/loxodo/default.nix @@ -11,7 +11,9 @@ python3.pkgs.buildPythonApplication { sha256 = "1cips4pvrqga8q1ibs23vjrf8dwan860x8jvjmc52h6qvvvv60yl"; }; - propagatedBuildInputs = with python3.pkgs; [ six wxPython_4_0 ]; + patches = [ ./wxpython.patch ]; + + propagatedBuildInputs = with python3.pkgs; [ six wxPython_4_2 ]; postInstall = '' mv $out/bin/loxodo.py $out/bin/loxodo diff --git a/pkgs/applications/misc/loxodo/wxpython.patch b/pkgs/applications/misc/loxodo/wxpython.patch new file mode 100644 index 000000000000..e22d3b5ad708 --- /dev/null +++ b/pkgs/applications/misc/loxodo/wxpython.patch @@ -0,0 +1,25 @@ +diff --git a/loxodo.py b/loxodo.py +index 68ad4c8..e96bc1a 100755 +--- a/loxodo.py ++++ b/loxodo.py +@@ -41,7 +41,7 @@ if len(sys.argv) > 1: + # In all other cases, use the "wx" frontend. + try: + import wx +- assert(wx.__version__.startswith('4.0.')) ++ assert(wx.__version__.startswith('4.')) + except AssertionError as e: + print('Found incompatible wxPython, the wxWidgets Python bindings: %s' % wx.__version__, file=sys.stderr) + print('Falling back to cmdline frontend.', file=sys.stderr) +diff --git a/src/frontends/wx/loxodo.py b/src/frontends/wx/loxodo.py +index bc3f509..e02c4bf 100644 +--- a/src/frontends/wx/loxodo.py ++++ b/src/frontends/wx/loxodo.py +@@ -25,6 +25,7 @@ from .loadframe import LoadFrame + + + def main(): ++ wx.SizerFlags.DisableConsistencyChecks() + app = wx.App(False) + setup_wx_locale() + mainframe = LoadFrame(None, -1, "")