kicad: reformat with nixpkgs-fmt

This commit is contained in:
Matt Huszagh
2020-10-10 12:53:09 -07:00
parent b13bb2402b
commit b3e2b523e5
2 changed files with 56 additions and 29 deletions
@@ -1,16 +1,29 @@
{ lib, stdenv, gnome3, wxGTK30, wxGTK31 { lib
, stdenv
, gnome3
, wxGTK30
, wxGTK31
, makeWrapper , makeWrapper
, gsettings-desktop-schemas, hicolor-icon-theme , gsettings-desktop-schemas
, callPackage, callPackages , hicolor-icon-theme
, librsvg, cups , callPackage
, callPackages
, librsvg
, cups
, pname ? "kicad" , pname ? "kicad"
, stable ? true , stable ? true
, oceSupport ? false, opencascade , oceSupport ? false
, withOCCT ? true, opencascade-occt , opencascade
, ngspiceSupport ? true, libngspice , withOCCT ? true
, scriptingSupport ? true, swig, python3 , opencascade-occt
, debug ? false, valgrind , ngspiceSupport ? true
, libngspice
, scriptingSupport ? true
, swig
, python3
, debug ? false
, valgrind
, with3d ? true , with3d ? true
, withI18n ? true , withI18n ? true
}: }:
@@ -19,18 +32,25 @@ assert ngspiceSupport -> libngspice != null;
with lib; with lib;
let let
baseName = if (stable) then "kicad" else "kicad-unstable"; baseName = if (stable) then "kicad" else "kicad-unstable";
versions = import ./versions.nix; versions = import ./versions.nix;
versionConfig = versions.${baseName}; versionConfig = versions.${baseName};
wxGTK = if (stable) wxGTK =
if (stable)
# wxGTK3x may default to withGtk2 = false, see #73145 # wxGTK3x may default to withGtk2 = false, see #73145
then wxGTK30.override { withGtk2 = false; } then
wxGTK30.override
{
withGtk2 = false;
}
# wxGTK31 currently introduces an issue with opening the python interpreter in pcbnew # wxGTK31 currently introduces an issue with opening the python interpreter in pcbnew
# but brings high DPI support? # but brings high DPI support?
else wxGTK31.override { withGtk2 = false; }; else
wxGTK31.override {
withGtk2 = false;
};
python = python3; python = python3;
wxPython = python.pkgs.wxPython_4_0; wxPython = python.pkgs.wxPython_4_0;
@@ -99,9 +119,11 @@ stdenv.mkDerivation rec {
(optionalString (scriptingSupport) "buildPythonPath \"${base} $pythonPath\" \n") (optionalString (scriptingSupport) "buildPythonPath \"${base} $pythonPath\" \n")
# wrap each of the directly usable tools # wrap each of the directly usable tools
( map ( tool: "makeWrapper ${base}/bin/${tool} $out/bin/${tool} $makeWrapperArgs" (map
(tool: "makeWrapper ${base}/bin/${tool} $out/bin/${tool} $makeWrapperArgs"
+ optionalString (scriptingSupport) " --set PYTHONPATH \"$program_PYTHONPATH\"" + optionalString (scriptingSupport) " --set PYTHONPATH \"$program_PYTHONPATH\""
) tools ) )
tools)
# link in the CLI utils # link in the CLI utils
(map (util: "ln -s ${base}/bin/${util} $out/bin/${util}") utils) (map (util: "ln -s ${base}/bin/${util} $out/bin/${util}") utils)
@@ -1,6 +1,11 @@
{ lib, stdenv, cmake, gettext { lib
, fetchFromGitHub, fetchFromGitLab , stdenv
, version, libSources , cmake
, gettext
, fetchFromGitHub
, fetchFromGitLab
, version
, libSources
}: }:
# callPackage libraries { # callPackage libraries {