diff options
| author | xeji <36407913+xeji@users.noreply.github.com> | 2018-06-13 03:16:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-13 03:16:24 +0200 |
| commit | 0acad472a4bf33ecadbdf3083f7b4745b218d44a (patch) | |
| tree | c4ca10b92070fd79217608a7d10cc2163dc90f23 /pkgs | |
| parent | dbfab81377824ebf8a1fdfd6e86de8c2f3eba69d (diff) | |
| parent | f4d4f5e65a2e4878829cf5fd1c5e5008e4d01f2b (diff) | |
| download | nixpkgs-0acad472a4bf33ecadbdf3083f7b4745b218d44a.tar nixpkgs-0acad472a4bf33ecadbdf3083f7b4745b218d44a.tar.gz nixpkgs-0acad472a4bf33ecadbdf3083f7b4745b218d44a.tar.bz2 nixpkgs-0acad472a4bf33ecadbdf3083f7b4745b218d44a.tar.lz nixpkgs-0acad472a4bf33ecadbdf3083f7b4745b218d44a.tar.xz nixpkgs-0acad472a4bf33ecadbdf3083f7b4745b218d44a.tar.zst nixpkgs-0acad472a4bf33ecadbdf3083f7b4745b218d44a.zip | |
Merge pull request #41818 from bgamari/kicad-bump
kicad-unstable: 2018-03-10 -> 2018-06-12
Diffstat (limited to 'pkgs')
| -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 7209ee3edf6..eca3ddd32e8 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 |