Skip to content
Permalink
Browse files

openscad: fix missing dependency

  • Loading branch information
peterhoeg committed Dec 10, 2018
1 parent e85c1f5 commit baa54b8af967226381742d2904718c0efc399ae4
Showing with 16 additions and 17 deletions.
  1. +15 −16 pkgs/applications/graphics/openscad/default.nix
  2. +1 −1 pkgs/top-level/all-packages.nix
@@ -1,36 +1,35 @@
{ stdenv, fetchFromGitHub, qt5, libsForQt5
{ stdenv, fetchFromGitHub, cmake
, qtbase, qscintilla
, bison, flex, eigen, boost, libGLU_combined, glew, opencsg, cgal
, mpfr, gmp, glib, pkgconfig, harfbuzz, gettext
, mpfr, gmp, glib, pkgconfig, harfbuzz, gettext, pcre, libzip
}:

stdenv.mkDerivation rec {
version = "2018.04-git";
name = "openscad-${version}";

# src = fetchurl {
# url = "http://files.openscad.org/${name}.src.tar.gz";
# sha256 = "0djsgi9yx1nxr2gh1kgsqw5vrbncp8v5li0p1pp02higqf1psajx";
# };
src = fetchFromGitHub {
owner = "openscad";
repo = "openscad";
rev = "179074dff8c23cbc0e651ce8463737df0006f4ca";
sha256 = "1y63yqyd0v255liik4ff5ak6mj86d8d76w436x76hs5dk6jgpmfb";
};

nativeBuildInputs = [ cmake pkgconfig ];

buildInputs = [
qtbase qscintilla
bison flex eigen boost libGLU_combined glew opencsg cgal mpfr gmp glib
pkgconfig harfbuzz gettext
]
++ (with qt5; [qtbase qmake])
++ (with libsForQt5; [qscintilla])
;
harfbuzz gettext pcre libzip
];

qmakeFlags = [ "VERSION=${version}" ];
cmakeFlags = [
"-DOpenGL_GL_PREFERENCE=GLVND"
];

doCheck = false;

meta = {
meta = with stdenv.lib; {
description = "3D parametric model compiler";
longDescription = ''
OpenSCAD is a software for creating solid 3D CAD objects. It is free
@@ -44,9 +43,9 @@ stdenv.mkDerivation rec {
interested in creating computer-animated movies.
'';
homepage = http://openscad.org/;
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers;
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers;
[ bjornfor raskin the-kenny ];
};
}

openorienteering-mapper = libsForQt5.callPackage ../applications/gis/openorienteering-mapper { };

openscad = callPackage ../applications/graphics/openscad {};
openscad = libsForQt5.callPackage ../applications/graphics/openscad {};

opentimestamps-client = python3Packages.callPackage ../tools/misc/opentimestamps-client {};

0 comments on commit baa54b8

Please sign in to comment.
You can’t perform that action at this time.