From b6863cbfe7d8e354281d89568f7252d02c9d7d8b Mon Sep 17 00:00:00 2001 From: Evils Date: Tue, 21 Jul 2020 08:52:04 +0200 Subject: [PATCH] kicad: fix build 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 --- .../science/electronics/kicad/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index a99f1b2d8d7a3f..a8340a2c22c413 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -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