JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kicad: replace with3DPackages option with an override

Browse Source
This commit is contained in:
Dmitry Kalinkin 2019-03-24 01:33:49 -04:00
parent 38b3292149
commit 9ba406ff1c
No known key found for this signature in database
GPG Key ID: 06AF1D3C38F04E0E
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,7 @@
, oceSupport ? true, opencascade
, ngspiceSupport ? true, libngspice
, swig, python, pythonPackages
, lndir, with3DPackages ? false
, lndir
}:
assert ngspiceSupport -> libngspice != null;
@ -93,9 +93,7 @@ in stdenv.mkDerivation rec {
};
};
modules = with passthru;
[ i18n symbols footprints templates ]
++ optional with3DPackages packages3d;
modules = with passthru; [ i18n symbols footprints templates ];
postInstall = ''
mkdir -p $out/share

2
pkgs/top-level/all-packages.nix
View File

@ -22031,7 +22031,7 @@ in
wxGTK = wxGTK30;
boost = boost160;
};
kicad-with-packages3d = kicad.override { with3DPackages = true; };
kicad-with-packages3d = kicad.overrideAttrs (old: { modules = old.modules ++ [ old.passthru.packages3d ]; });
kicad-unstable = python.pkgs.callPackage ../applications/science/electronics/kicad/unstable.nix {
wxGTK = wxGTK30;