kicad-unstable: 2018-03-10 -> 2018-06-12

This commit is contained in:
Ben Gamari 2018-06-10 21:36:47 -04:00
parent f9f0307f7a
commit f4d4f5e65a

View file

@ -12,13 +12,13 @@ assert ngspiceSupport -> libngspice != null;
with lib; with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "kicad-unstable-${version}"; name = "kicad-unstable-${version}";
version = "2018-03-10"; version = "2018-06-12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "KICad"; owner = "KICad";
repo = "kicad-source-mirror"; repo = "kicad-source-mirror";
rev = "17c0917dac12ea0be50ff95cee374a0cd8b7f862"; rev = "bc7bd107d980da147ad515aeae0469ddd55c2368";
sha256 = "1yn5hj5hjnpb5fkzzlyawg62a96fbfvha49395s22dcp95riqvf0"; sha256 = "11nsx52pd3jr2wbzr11glmcs1a9r7z1mqkqx6yvlm0awbgd8qlv8";
}; };
postPatch = '' postPatch = ''
@ -38,7 +38,8 @@ stdenv.mkDerivation rec {
"-DCMAKE_CXX_FLAGS=-I${wxPython}/include/wx-3.0" "-DCMAKE_CXX_FLAGS=-I${wxPython}/include/wx-3.0"
]; ];
nativeBuildInputs = [ cmake doxygen pkgconfig ]; # https://www.mail-archive.com/kicad-developers@lists.launchpad.net/msg29840.html
nativeBuildInputs = [ (cmake.override {majorVersion = "3.10";}) doxygen pkgconfig ];
buildInputs = [ buildInputs = [
libGLU_combined zlib libX11 wxGTK pcre libXdmcp gettext glew glm libpthreadstubs libGLU_combined zlib libX11 wxGTK pcre libXdmcp gettext glew glm libpthreadstubs
cairo curl openssl boost cairo curl openssl boost