diff options
| author | Evils <evils.devils@protonmail.com> | 2023-02-14 13:26:56 +0100 |
|---|---|---|
| committer | pennae <82953136+pennae@users.noreply.github.com> | 2023-02-16 14:25:11 +0100 |
| commit | 08c96035b988ed54b4b7526054a7737cbb82dfd0 (patch) | |
| tree | 7868056e1a6972ce66a33b612cbf2b133bb28e86 /pkgs/applications/science/electronics/kicad | |
| parent | c8d22b3c2a8aa87a717b2ac81ec9d04452e0b57f (diff) | |
kicad: add patches to accept wxwidgets 3.2.2.1
Diffstat (limited to 'pkgs/applications/science/electronics/kicad')
| -rw-r--r-- | pkgs/applications/science/electronics/kicad/base.nix | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index 3833a5e72918b..697c27842081d 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -22,6 +22,7 @@ , libXdmcp , lndir , unixODBC +, fetchpatch , util-linux , libselinux @@ -71,6 +72,19 @@ stdenv.mkDerivation rec { patches = [ # upstream issue 12941 (attempted to upstream, but appreciably unacceptable) ./writable.patch + ] + ++ optionals (stable) # the 2 wxGTK ones should in the next stable point release + [ + (fetchpatch { # for wxGTK 3.2.2.1's .1 field + name = "support wxWidgets subrelease field"; + url = "https://gitlab.com/kicad/code/kicad/-/commit/b536580119c59fde78e38d8d6388f2540ecb6cf9.diff"; + hash = "sha256-F+J5oZO0BsT1VWKpx0KGA7ecn5/PBgCw8uiScihM+54="; + }) + (fetchpatch { # for wxGTK 3.2.2.1's .1 field, but for wxPython + name = "relax wxPython check to just major.minor"; + url = "https://gitlab.com/kicad/code/kicad/-/commit/1e8cc6855d6a8fc1f9dfc933224c3a10fb759f9c.diff"; + hash = "sha256-CGNgxZ7QiVLkaauNl7Pmcl152lwyDZqA/HSyFdOswwU="; + }) ]; # tagged releases don't have "unknown" |