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

kicad-unstable: 2020-08-22 -> 2020-10-09

Browse Source 
base.nix requires gtk3 to compile
This commit is contained in:
Matt Huszagh 2020-10-08 18:47:55 -07:00
parent b67afd8a44
commit 104aca941a
2 changed files with 81 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,23 +1,51 @@
{ lib, stdenv, fetchFromGitLab, cmake, libGLU, libGL, zlib, wxGTK { lib
, libX11, gettext, glew, glm, cairo, curl, openssl, boost, pkgconfig , stdenv
, doxygen, pcre, libpthreadstubs, libXdmcp, fetchpatch, lndir, callPackages , fetchFromGitLab
, cmake
, libGLU
, libGL
, zlib
, wxGTK
, libX11
, gettext
, glew
, glm
, cairo
, curl
, openssl
, boost
, pkgconfig
, doxygen
, pcre
, libpthreadstubs
, libXdmcp
, fetchpatch
, lndir
, callPackages
, stable ? true , stable ? true
, baseName ? "kicad" , baseName ? "kicad"
, versions ? { } , versions ? { }
, oceSupport ? false, opencascade , oceSupport ? false
, withOCCT ? true, opencascade-occt , opencascade
, ngspiceSupport ? true, libngspice , withOCCT ? true
, scriptingSupport ? true, swig, python, wxPython , opencascade-occt
, debug ? false, valgrind , ngspiceSupport ? true
, libngspice
, scriptingSupport ? true
, swig
, python
, wxPython
, debug ? false
, valgrind
, withI18n ? true , withI18n ? true
, gtk3
}: }:
assert ngspiceSupport -> libngspice != null; assert ngspiceSupport -> libngspice != null;
with lib; with lib;
let let
versionConfig = versions.${baseName}; versionConfig = versions.${baseName};
# oce on aarch64 fails a test # oce on aarch64 fails a test
@ -95,8 +123,22 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake doxygen pkgconfig lndir ]; nativeBuildInputs = [ cmake doxygen pkgconfig lndir ];
buildInputs = [ buildInputs = [
libGLU libGL zlib libX11 wxGTK pcre libXdmcp gettext libGLU
glew glm libpthreadstubs cairo curl openssl boost libGL
zlib
libX11
wxGTK
pcre
libXdmcp
gettext
glew
glm
libpthreadstubs
cairo
curl
openssl
boost
gtk3
] ]
++ optionals (scriptingSupport) [ swig python wxPython ] ++ optionals (scriptingSupport) [ swig python wxPython ]
++ optional (ngspiceSupport) libngspice ++ optional (ngspiceSupport) libngspice

56
pkgs/applications/science/electronics/kicad/versions.nix
View File

@ -3,49 +3,49 @@
{ {
"kicad" = { "kicad" = {
kicadVersion = { kicadVersion = {
version = "5.1.6"; version = "5.1.6";
src = { src = {
rev = "c6e7f7de7df655fd59b57823499efc443009de6b"; rev = "c6e7f7de7df655fd59b57823499efc443009de6b";
sha256 = "1pa3z0h0679jmgxlzc833h6q85b5paxdp69kf2h93vkaryj58622"; sha256 = "1pa3z0h0679jmgxlzc833h6q85b5paxdp69kf2h93vkaryj58622";
}; };
}; };
libVersion = { libVersion = {
version = "5.1.6"; version = "5.1.6";
libSources = { libSources = {
i18n.rev = "5ad171ce5c8d90f4740517c2adecb310d8be51bd"; i18n.rev = "5ad171ce5c8d90f4740517c2adecb310d8be51bd";
i18n.sha256 = "0qryi8xjm23ka363zfl7bbga0v5c31fr3d4nyxp3m168vkv9zhha"; i18n.sha256 = "0qryi8xjm23ka363zfl7bbga0v5c31fr3d4nyxp3m168vkv9zhha";
symbols.rev = "5150eaa2a7d15cfc6bb1459c527c4ebaa66d7708"; symbols.rev = "5150eaa2a7d15cfc6bb1459c527c4ebaa66d7708";
symbols.sha256 = "12w3rdy085drlikkpb27n9ni7cyg9l0pqy7hnr86cxjcw3l5wcx6"; symbols.sha256 = "12w3rdy085drlikkpb27n9ni7cyg9l0pqy7hnr86cxjcw3l5wcx6";
templates.rev = "9213d439f757e6049b7e54f3ea08272a0d0f44a9"; templates.rev = "9213d439f757e6049b7e54f3ea08272a0d0f44a9";
templates.sha256 = "1hppcsrkn4dk6ggby6ckh0q65qxkywrbyxa4lwpaf7pxjyv498xg"; templates.sha256 = "1hppcsrkn4dk6ggby6ckh0q65qxkywrbyxa4lwpaf7pxjyv498xg";
footprints.rev = "a61b4e49762fb355f654e65a1c7db1aaf7bb2332"; footprints.rev = "a61b4e49762fb355f654e65a1c7db1aaf7bb2332";
footprints.sha256 = "1kmf91a5mmvj9izrv40mkaw1w36yjgn8daczd9rq2wlmd0rdp1zx"; footprints.sha256 = "1kmf91a5mmvj9izrv40mkaw1w36yjgn8daczd9rq2wlmd0rdp1zx";
packages3d.rev = "150ff1caf0b01dc04c84f4f966f4f88fedfa8f8c"; packages3d.rev = "150ff1caf0b01dc04c84f4f966f4f88fedfa8f8c";
packages3d.sha256 = "0b9jglf77fy0n0r8xs4yqkv6zvipyfvp0z5dnqlzp32csy5aqpi1"; packages3d.sha256 = "0b9jglf77fy0n0r8xs4yqkv6zvipyfvp0z5dnqlzp32csy5aqpi1";
}; };
}; };
}; };
"kicad-unstable" = { "kicad-unstable" = {
kicadVersion = { kicadVersion = {
version = "2020-08-22"; version = "2020-10-09";
src = { src = {
rev = "a2341f0f335b0abb9fc8cb86d19cbe6f9b38fade"; rev = "560428a70f0196fb4ade620042c5ddefc1685ebe";
sha256 = "0167yb39f800xarq3khn7sbdkgcx9j2ayhy8c7lhhks6kh7459g0"; sha256 = "0rzn83bpl06v1d49lcvwfg93nirn684bqqq536zxhmjm0ayx29ka";
}; };
}; };
libVersion = { libVersion = {
version = "2020-08-22"; version = "2020-10-09";
libSources = { libSources = {
i18n.rev = "cbbb1efd940094bf0c3168280698b2b059a8c509"; i18n.rev = "d24af2da8cab4ce1081c401909a4a880514e5549";
i18n.sha256 = "1q4jakn6m8smnr2mg7jgb520nrb6fag9mdvlcpx3smp3qbxka818"; i18n.sha256 = "0r0sv52k84sw4jxf10lrmzwmn58d2fv5h57fdrspnmvnh10q63xf";
symbols.rev = "9ca6a5348cdeb88e699582d4ed051ff7303b44d3"; symbols.rev = "9c50f4333bafc5a1abf7786436db5ffb6a66758d";
symbols.sha256 = "13w6pb34rhz96rnar25z7kiscy6q1fm8l39hq1bpb8g9yn86ssz4"; symbols.sha256 = "06ic59svz0256isy93863i5ay4k8wshvp1kspnqrc776wmq03l3k";
templates.rev = "ae16953b81055855bcede4a33305413599d86a15"; templates.rev = "41eae4ccd3ac02fdb969e3aa272c07ab51dcf5af";
templates.sha256 = "1pkv90p3liy3bj4nklxsvpzh9m56p0k5ldr22armvgqfaqaadx9v"; templates.sha256 = "0xxfkpsgbnafmpaxpz1747zn7fhqp0kfl32rzjrx4vzxyp25q805";
footprints.rev = "f94c2d5d619d16033f69a555b449f59604d97865"; footprints.rev = "50015af7e603cc499199c7e1c6daa7c85dd732ae";
footprints.sha256 = "1g71sk77jvqaf9xvgq6dkyvd9pij2lb4n0bn0dqnwddhwam935db"; footprints.sha256 = "16bic67klbj7sgj7cab8ha2fg3ypp9ap82gxkn6ijvpl7dka8bhb";
packages3d.rev = "f699b0e3c13fe75618086913e39279c85da14cc7"; packages3d.rev = "df0dc0074491bb665b2c3ce569cbd4aa16118ad6";
packages3d.sha256 = "0m5rb5axa946v729z35ga84in76y4zpk32qzi0hwqx957zy72hs9"; packages3d.sha256 = "027jlcp9fpryldjkcxhb1b5bpwqna9kl6r0lnkd86x238kj3rd8v";
}; };
}; };
}; };