public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

openscad: fix build by switching to git master and Qt5

Browse Source
This commit is contained in:
Michael Raskin 2018-05-04 18:55:09 +02:00
parent 7873fe2669
commit c68dc2212e
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkgs/applications/graphics/openscad/default.nix
View File

@ -1,20 +1,30 @@
{ stdenv, fetchurl, qt4, qmake4Hook, bison, flex, eigen, boost, libGLU_combined, glew, opencsg, cgal { stdenv, fetchurl, fetchFromGitHub, qt5, libsForQt5
, mpfr, gmp, glib, pkgconfig, harfbuzz, qscintilla, gettext , bison, flex, eigen, boost, libGLU_combined, glew, opencsg, cgal
, mpfr, gmp, glib, pkgconfig, harfbuzz, gettext
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2015.03-3"; version = "2018.04-git";
name = "openscad-${version}"; name = "openscad-${version}";
src = fetchurl { # src = fetchurl {
url = "http://files.openscad.org/${name}.src.tar.gz"; # url = "http://files.openscad.org/${name}.src.tar.gz";
sha256 = "0djsgi9yx1nxr2gh1kgsqw5vrbncp8v5li0p1pp02higqf1psajx"; # sha256 = "0djsgi9yx1nxr2gh1kgsqw5vrbncp8v5li0p1pp02higqf1psajx";
# };
src = fetchFromGitHub {
owner = "openscad";
repo = "openscad";
rev = "179074dff8c23cbc0e651ce8463737df0006f4ca";
sha256 = "1y63yqyd0v255liik4ff5ak6mj86d8d76w436x76hs5dk6jgpmfb";
}; };
buildInputs = [ buildInputs = [
qt4 qmake4Hook bison flex eigen boost libGLU_combined glew opencsg cgal mpfr gmp glib bison flex eigen boost libGLU_combined glew opencsg cgal mpfr gmp glib
pkgconfig harfbuzz qscintilla gettext pkgconfig harfbuzz gettext
]; ]
++ (with qt5; [qtbase qmake])
++ (with libsForQt5; [qscintilla])
;
qmakeFlags = [ "VERSION=${version}" ]; qmakeFlags = [ "VERSION=${version}" ];