diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2022-11-05 03:35:27 +0100 |
|---|---|---|
| committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2022-11-05 03:35:27 +0100 |
| commit | 0b894f5564ab21bcff4454d2358fc04eda7e1492 (patch) | |
| tree | ac04b11bd44de1280d891d64a55a90113747f521 /pkgs/applications/science/electronics/kicad/default.nix | |
| parent | bb5a69de8803f58c7a472bb14c4018ad6333fd28 (diff) | |
| download | nixpkgs-0b894f5564ab21bcff4454d2358fc04eda7e1492.tar nixpkgs-0b894f5564ab21bcff4454d2358fc04eda7e1492.tar.gz nixpkgs-0b894f5564ab21bcff4454d2358fc04eda7e1492.tar.bz2 nixpkgs-0b894f5564ab21bcff4454d2358fc04eda7e1492.tar.lz nixpkgs-0b894f5564ab21bcff4454d2358fc04eda7e1492.tar.xz nixpkgs-0b894f5564ab21bcff4454d2358fc04eda7e1492.tar.zst nixpkgs-0b894f5564ab21bcff4454d2358fc04eda7e1492.zip | |
kicad: migrate to wxGTK32
Diffstat (limited to 'pkgs/applications/science/electronics/kicad/default.nix')
| -rw-r--r-- | pkgs/applications/science/electronics/kicad/default.nix | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 9042862eac3..1540e3bdb69 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -2,7 +2,7 @@ , fetchFromGitLab , gnome , dconf -, wxGTK31 +, wxGTK32 , gtk3 , makeWrapper , gsettings-desktop-schemas @@ -104,9 +104,9 @@ let if srcOverridep "libVersion" then srcs.libVersion else versionsImport.${baseName}.libVersion.version; - wxGTK = wxGTK31; + wxGTK = wxGTK32; python = python3; - wxPython = python.pkgs.wxPython_4_1; + wxPython = python.pkgs.wxPython_4_2; inherit (lib) concatStringsSep flatten optionalString optionals; in @@ -224,11 +224,6 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ evils kiwi ]; # kicad is cross platform platforms = lib.platforms.all; - # despite that, nipkgs' wxGTK for darwin is "wxmac" - # and wxPython_4_0 does not account for this - # adjusting this package to downgrade to python2Packages.wxPython (wxPython 3), - # seems like more trouble than fixing wxPython_4_0 would be - # additionally, libngspice is marked as linux only, though it should support darwin hydraPlatforms = if (with3d) then [ ] else platforms; # We can't download the 3d models on Hydra, |