diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2018-05-04 18:55:09 +0200 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2018-05-04 19:15:35 +0200 |
| commit | c68dc2212e22899de52d470198c74abd51935dab (patch) | |
| tree | a978725a7d3743939bc6518234ff7b692094f324 /pkgs/applications/graphics/openscad | |
| parent | 7873fe26693e86e38195e07ee0fd31d1a7f44e6c (diff) | |
| download | nixlib-c68dc2212e22899de52d470198c74abd51935dab.tar nixlib-c68dc2212e22899de52d470198c74abd51935dab.tar.gz nixlib-c68dc2212e22899de52d470198c74abd51935dab.tar.bz2 nixlib-c68dc2212e22899de52d470198c74abd51935dab.tar.lz nixlib-c68dc2212e22899de52d470198c74abd51935dab.tar.xz nixlib-c68dc2212e22899de52d470198c74abd51935dab.tar.zst nixlib-c68dc2212e22899de52d470198c74abd51935dab.zip | |
openscad: fix build by switching to git master and Qt5
Diffstat (limited to 'pkgs/applications/graphics/openscad')
| -rw-r--r-- | pkgs/applications/graphics/openscad/default.nix | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index 33fddf6c8d01..9ab5288700cc 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -1,20 +1,30 @@ -{ stdenv, fetchurl, qt4, qmake4Hook, bison, flex, eigen, boost, libGLU_combined, glew, opencsg, cgal -, mpfr, gmp, glib, pkgconfig, harfbuzz, qscintilla, gettext +{ stdenv, fetchurl, fetchFromGitHub, qt5, libsForQt5 +, bison, flex, eigen, boost, libGLU_combined, glew, opencsg, cgal +, mpfr, gmp, glib, pkgconfig, harfbuzz, gettext }: stdenv.mkDerivation rec { - version = "2015.03-3"; + version = "2018.04-git"; name = "openscad-${version}"; - src = fetchurl { - url = "http://files.openscad.org/${name}.src.tar.gz"; - sha256 = "0djsgi9yx1nxr2gh1kgsqw5vrbncp8v5li0p1pp02higqf1psajx"; +# src = fetchurl { +# url = "http://files.openscad.org/${name}.src.tar.gz"; +# sha256 = "0djsgi9yx1nxr2gh1kgsqw5vrbncp8v5li0p1pp02higqf1psajx"; +# }; + src = fetchFromGitHub { + owner = "openscad"; + repo = "openscad"; + rev = "179074dff8c23cbc0e651ce8463737df0006f4ca"; + sha256 = "1y63yqyd0v255liik4ff5ak6mj86d8d76w436x76hs5dk6jgpmfb"; }; buildInputs = [ - qt4 qmake4Hook bison flex eigen boost libGLU_combined glew opencsg cgal mpfr gmp glib - pkgconfig harfbuzz qscintilla gettext - ]; + bison flex eigen boost libGLU_combined glew opencsg cgal mpfr gmp glib + pkgconfig harfbuzz gettext + ] + ++ (with qt5; [qtbase qmake]) + ++ (with libsForQt5; [qscintilla]) + ; qmakeFlags = [ "VERSION=${version}" ]; |