pyrox.dev
openscad: fix build by switching to git master and Qt5
+19
-9
pkgs/applications/graphics/openscad/default.nix
+19
-9
pkgs/applications/graphics/openscad/default.nix
···
1
-
{ stdenv, fetchurl, qt4, qmake4Hook, bison, flex, eigen, boost, libGLU_combined, glew, opencsg, cgal
2
-
, mpfr, gmp, glib, pkgconfig, harfbuzz, qscintilla, gettext
1
+
{ stdenv, fetchurl, fetchFromGitHub, qt5, libsForQt5
2
+
, bison, flex, eigen, boost, libGLU_combined, glew, opencsg, cgal
3
+
, mpfr, gmp, glib, pkgconfig, harfbuzz, gettext
3
4
}:
4
5
5
6
stdenv.mkDerivation rec {
6
-
version = "2015.03-3";
7
+
version = "2018.04-git";
7
8
name = "openscad-${version}";
8
9
9
-
src = fetchurl {
10
-
url = "http://files.openscad.org/${name}.src.tar.gz";
11
-
sha256 = "0djsgi9yx1nxr2gh1kgsqw5vrbncp8v5li0p1pp02higqf1psajx";
10
+
# src = fetchurl {
11
+
# url = "http://files.openscad.org/${name}.src.tar.gz";
12
+
# sha256 = "0djsgi9yx1nxr2gh1kgsqw5vrbncp8v5li0p1pp02higqf1psajx";
13
+
# };
14
+
src = fetchFromGitHub {
15
+
owner = "openscad";
16
+
repo = "openscad";
17
+
rev = "179074dff8c23cbc0e651ce8463737df0006f4ca";
18
+
sha256 = "1y63yqyd0v255liik4ff5ak6mj86d8d76w436x76hs5dk6jgpmfb";
12
19
};
13
20
14
21
buildInputs = [
15
-
qt4 qmake4Hook bison flex eigen boost libGLU_combined glew opencsg cgal mpfr gmp glib
16
-
pkgconfig harfbuzz qscintilla gettext
17
-
];
22
+
bison flex eigen boost libGLU_combined glew opencsg cgal mpfr gmp glib
23
+
pkgconfig harfbuzz gettext
24
+
]
25
+
++ (with qt5; [qtbase qmake])
26
+
++ (with libsForQt5; [qscintilla])
27
+
;
18
28
19
29
qmakeFlags = [ "VERSION=${version}" ];
20
30