Merge staging-next into staging

2020-11-11 16:00:34 +01:00
parent fad425cfbb f70be9a3d1
commit 4076ffe580
155 changed files with 1569 additions and 801 deletions
@@ -7691,6 +7691,14 @@ in {
    };
  };

+  wxPython_4_1 = callPackage ../development/python-modules/wxPython/4.1.nix {
+    inherit (pkgs) pkgconfig;
+    wxGTK = pkgs.wxGTK31.override {
+      withGtk2 = false;
+      withWebKit = true;
+    };
+  };
+
  wxPython = self.wxPython30;

  x11_hash = callPackage ../development/python-modules/x11_hash { };