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

kicad: remove unnecessary with lib; statements

Browse Source
This commit is contained in:
Matt Huszagh 2020-10-10 15:37:15 -07:00
parent e2fea84597
commit 85d5195f70
3 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/science/electronics/kicad/base.nix
View File

@ -1,5 +1,4 @@
{ lib { stdenv
, stdenv
, fetchFromGitLab , fetchFromGitLab
, cmake , cmake
, libGLU , libGLU
@ -44,7 +43,6 @@
assert ngspiceSupport -> libngspice != null; assert ngspiceSupport -> libngspice != null;
with lib;
let let
versionConfig = versions.${baseName}; versionConfig = versions.${baseName};
@ -54,6 +52,7 @@ let
libraries = callPackages ./libraries.nix versionConfig.libVersion; libraries = callPackages ./libraries.nix versionConfig.libVersion;
inherit (stdenv.lib) optional optionals;
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -166,7 +165,7 @@ stdenv.mkDerivation rec {
the libraries are passed via an env var in the wrapper, default.nix the libraries are passed via an env var in the wrapper, default.nix
''; '';
homepage = "https://www.kicad-pcb.org/"; homepage = "https://www.kicad-pcb.org/";
license = licenses.agpl3; license = stdenv.lib.licenses.agpl3;
platforms = platforms.all; platforms = stdenv.lib.platforms.all;
}; };
} }

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

@ -1,5 +1,5 @@
{ lib { stdenv
, stdenv , fetchFromGitLab
, gnome3 , gnome3
, wxGTK30 , wxGTK30
, wxGTK31 , wxGTK31
@ -29,8 +29,6 @@
}: }:
assert ngspiceSupport -> libngspice != null; assert ngspiceSupport -> libngspice != null;
with lib;
let let
baseName = if (stable) then "kicad" else "kicad-unstable"; baseName = if (stable) then "kicad" else "kicad-unstable";
@ -55,6 +53,7 @@ let
python = python3; python = python3;
wxPython = python.pkgs.wxPython_4_0; wxPython = python.pkgs.wxPython_4_0;
inherit (stdenv.lib) concatStringsSep flatten optionalString optionals;
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -109,7 +108,7 @@ stdenv.mkDerivation rec {
# why does $makeWrapperArgs have to be added explicitly? # why does $makeWrapperArgs have to be added explicitly?
# $out and $program_PYTHONPATH don't exist when makeWrapperArgs gets set? # $out and $program_PYTHONPATH don't exist when makeWrapperArgs gets set?
# kicad-ogltest's source seems to indicate that crashing is expected behaviour... # kicad-ogltest's source seems to indicate that crashing is expected behaviour...
installPhase = with lib; installPhase =
let let
tools = [ "kicad" "pcbnew" "eeschema" "gerbview" "pcb_calculator" "pl_editor" "bitmap2component" ]; tools = [ "kicad" "pcbnew" "eeschema" "gerbview" "pcb_calculator" "pl_editor" "bitmap2component" ];
utils = [ "dxf2idf" "idf2vrml" "idfcyl" "idfrect" "kicad2step" "kicad-ogltest" ]; utils = [ "dxf2idf" "idf2vrml" "idfcyl" "idfrect" "kicad2step" "kicad-ogltest" ];
@ -148,7 +147,7 @@ stdenv.mkDerivation rec {
KiCad is an open source software suite for Electronic Design Automation. KiCad is an open source software suite for Electronic Design Automation.
The Programs handle Schematic Capture, and PCB Layout with Gerber output. The Programs handle Schematic Capture, and PCB Layout with Gerber output.
''; '';
license = licenses.agpl3; license = stdenv.lib.licenses.agpl3;
# berce seems inactive... # berce seems inactive...
maintainers = with stdenv.lib.maintainers; [ evils kiwi berce ]; maintainers = with stdenv.lib.maintainers; [ evils kiwi berce ];
# kicad is cross platform # kicad is cross platform

8
pkgs/applications/science/electronics/kicad/libraries.nix
View File

@ -1,5 +1,4 @@
{ lib { stdenv
, stdenv
, cmake , cmake
, gettext , gettext
, fetchFromGitHub , fetchFromGitHub
@ -15,7 +14,6 @@
# sha256 = "..."; # sha256 = "...";
# }; # };
# }; # };
with lib;
let let
mkLib = name: mkLib = name:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -34,7 +32,7 @@ let
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
meta = rec { meta = rec {
license = licenses.cc-by-sa-40; license = stdenv.lib.licenses.cc-by-sa-40;
platforms = stdenv.lib.platforms.all; platforms = stdenv.lib.platforms.all;
# the 3d models are a ~1 GiB download and occupy ~5 GiB in store. # the 3d models are a ~1 GiB download and occupy ~5 GiB in store.
# this would exceed the hydra output limit # this would exceed the hydra output limit
@ -69,7 +67,7 @@ in
); );
nativeBuildInputs = [ cmake gettext ]; nativeBuildInputs = [ cmake gettext ];
meta = { meta = {
license = licenses.gpl2; # https://github.com/KiCad/kicad-i18n/issues/3 license = stdenv.lib.licenses.gpl2; # https://github.com/KiCad/kicad-i18n/issues/3
platforms = stdenv.lib.platforms.all; platforms = stdenv.lib.platforms.all;
}; };
}; };