From 9ba406ff1c5f2621f3baf44e2bad32c1e251412f Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 24 Mar 2019 01:33:49 -0400 Subject: [PATCH] kicad: replace with3DPackages option with an override --- pkgs/applications/science/electronics/kicad/default.nix | 6 ++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index de47589aef8..fa4fce26734 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6dc2f333519..363717aa411 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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;