diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2018-06-10 21:36:47 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2018-06-12 20:15:51 -0400 |
| commit | f4d4f5e65a2e4878829cf5fd1c5e5008e4d01f2b (patch) | |
| tree | 9ded4842a9209dfa38f96410b8e7d78b099e4b05 /pkgs/applications/science/electronics | |
| parent | f9f0307f7a82902b457b665dbdc80c9bcda96303 (diff) | |
| download | nixlib-f4d4f5e65a2e4878829cf5fd1c5e5008e4d01f2b.tar nixlib-f4d4f5e65a2e4878829cf5fd1c5e5008e4d01f2b.tar.gz nixlib-f4d4f5e65a2e4878829cf5fd1c5e5008e4d01f2b.tar.bz2 nixlib-f4d4f5e65a2e4878829cf5fd1c5e5008e4d01f2b.tar.lz nixlib-f4d4f5e65a2e4878829cf5fd1c5e5008e4d01f2b.tar.xz nixlib-f4d4f5e65a2e4878829cf5fd1c5e5008e4d01f2b.tar.zst nixlib-f4d4f5e65a2e4878829cf5fd1c5e5008e4d01f2b.zip | |
kicad-unstable: 2018-03-10 -> 2018-06-12
Diffstat (limited to 'pkgs/applications/science/electronics')
| -rw-r--r-- | pkgs/applications/science/electronics/kicad/unstable.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/applications/science/electronics/kicad/unstable.nix b/pkgs/applications/science/electronics/kicad/unstable.nix index 7209ee3edf60..eca3ddd32e8b 100644 --- a/pkgs/applications/science/electronics/kicad/unstable.nix +++ b/pkgs/applications/science/electronics/kicad/unstable.nix @@ -12,13 +12,13 @@ assert ngspiceSupport -> libngspice != null; with lib; stdenv.mkDerivation rec { name = "kicad-unstable-${version}"; - version = "2018-03-10"; + version = "2018-06-12"; src = fetchFromGitHub { owner = "KICad"; repo = "kicad-source-mirror"; - rev = "17c0917dac12ea0be50ff95cee374a0cd8b7f862"; - sha256 = "1yn5hj5hjnpb5fkzzlyawg62a96fbfvha49395s22dcp95riqvf0"; + rev = "bc7bd107d980da147ad515aeae0469ddd55c2368"; + sha256 = "11nsx52pd3jr2wbzr11glmcs1a9r7z1mqkqx6yvlm0awbgd8qlv8"; }; postPatch = '' @@ -38,7 +38,8 @@ stdenv.mkDerivation rec { "-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 = [ libGLU_combined zlib libX11 wxGTK pcre libXdmcp gettext glew glm libpthreadstubs cairo curl openssl boost |