nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-17 17:44:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

kicad: fix build

Browse Source 
disable scripting support as 92261 broke wxPython_4_0
  and i haven't managed to get wxPython 4.1 to work

something caused makeWrapper to have to be added on its own
  not sure where it came from before...

and some cleanup
This commit is contained in:
Evils 2020-07-21 08:52:04 +02:00 committed by Dmitry Kalinkin
parent e842233678
commit b6863cbfe7
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/applications/science/electronics/kicad/default.nix
View File

@ -1,4 +1,5 @@
{ lib, stdenv, gnome3, pkgs, wxGTK30, wxGTK31
{ lib, stdenv, gnome3, wxGTK30, wxGTK31
, makeWrapper
, gsettings-desktop-schemas, hicolor-icon-theme
, callPackage, callPackages
, librsvg, cups
@ -8,7 +9,7 @@
, oceSupport ? false, opencascade
, withOCCT ? true, opencascade-occt
, ngspiceSupport ? true, libngspice
, scriptingSupport ? true, swig, python3
, scriptingSupport ? false, swig, python3
, debug ? false, valgrind
, with3d ? true
, withI18n ? true
@ -31,9 +32,8 @@ let
# but brings high DPI support?
else wxGTK31.override { withGtk2 = false; };
pythonPackages = python.pkgs;
python = python3;
wxPython = pythonPackages.wxPython_4_0;
wxPython = python.pkgs.wxPython_4_0;
in
stdenv.mkDerivation rec {
@ -55,10 +55,11 @@ stdenv.mkDerivation rec {
dontFixup = true;
pythonPath = optionals (scriptingSupport)
[ wxPython pythonPackages.six ];
[ wxPython python.pkgs.six ];
nativeBuildInputs = optionals (scriptingSupport)
[ pythonPackages.wrapPython ];
nativeBuildInputs = [ makeWrapper ]
++ optionals (scriptingSupport)
[ python.pkgs.wrapPython ];
# wrapGAppsHook added the equivalent to ${base}/share
# though i noticed no difference without it