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

Merge pull request #82760 from veprbl/pr/kicad_fix

Browse Source 
[ZHF] kicad: don't build versions with 3d on Hydra
This commit is contained in:
Dmitry Kalinkin 2020-03-16 23:55:05 -04:00 committed by GitHub
commit e352fccb6a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -137,5 +137,9 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ evils kiwi berce ]; maintainers = with maintainers; [ evils kiwi berce ];
# kicad's cross-platform, not sure what to fill in here # kicad's cross-platform, not sure what to fill in here
platforms = with platforms; linux; platforms = with platforms; linux;
} // optionalAttrs with3d {
# We can't download the 3d models on Hydra - they are a ~1 GiB download and
# they occupy ~5 GiB in store.
hydraPlatforms = [];
}; };
} }

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

@ -12,8 +12,8 @@
# }; # };
with lib; with lib;
let let
mkLib = name: attrs: mkLib = name:
stdenv.mkDerivation ( stdenv.mkDerivation
{ {
pname = "kicad-${name}"; pname = "kicad-${name}";
version = "${version}"; version = "${version}";
@ -27,16 +27,13 @@ let
); );
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
meta.license = licenses.cc-by-sa-40; meta.license = licenses.cc-by-sa-40;
} // attrs };
);
in in
{ {
symbols = mkLib "symbols" { }; symbols = mkLib "symbols";
templates = mkLib "templates" { }; templates = mkLib "templates";
footprints = mkLib "footprints" { }; footprints = mkLib "footprints";
packages3d = mkLib "packages3d" { packages3d = mkLib "packages3d";
hydraPlatforms = []; # this is a ~1 GiB download, occupies ~5 GiB in store
};
# i18n is a special case, not actually a library # i18n is a special case, not actually a library
# more a part of kicad proper, but also optional and separate # more a part of kicad proper, but also optional and separate