Merge pull request #489 from bjornfor/openscad
openscad: version bump + small fixes
This commit is contained in:
commit
c278f25c18
@ -1,32 +1,40 @@
|
|||||||
{stdenv, fetchgit, qt4, bison, flex, eigen, boost, mesa, glew, opencsg, cgal
|
{stdenv, fetchurl, qt4, bison, flex, eigen, boost, mesa, glew, opencsg, cgal
|
||||||
, mpfr, gmp
|
, mpfr, gmp
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "git-20121213";
|
version = "2013.01";
|
||||||
name = "openscad-${version}";
|
name = "openscad-${version}";
|
||||||
# src = fetchurl {
|
|
||||||
# url = "https://github.com/downloads/openscad/openscad/${name}.src.tar.gz";
|
src = fetchurl {
|
||||||
# sha256 = "0gaqwzxbbzc21lhb4y26j8g0g28dhrwrgkndizp5ddab5axi4zjh";
|
url = "https://openscad.googlecode.com/files/${name}.src.tar.gz";
|
||||||
# };
|
sha256 = "01r013l8zyfkgmqn05axh3rlfsjwd6j403w5ffl7nby4i2spiw1f";
|
||||||
src = fetchgit {
|
};
|
||||||
url = "https://github.com/openscad/openscad.git";
|
|
||||||
rev = "c0612a9ed0899c96963e04c848a59b0164a689a2";
|
|
||||||
sha256 = "1zqiwk1cjbj7sng9sdarbrs0zxkn9fsa84dyv8n0zlyh40s7kvw2";
|
|
||||||
};
|
|
||||||
|
|
||||||
buildInputs = [qt4 bison flex eigen boost mesa glew opencsg cgal gmp mpfr];
|
buildInputs = [qt4 bison flex eigen boost mesa glew opencsg cgal gmp mpfr];
|
||||||
|
|
||||||
configurePhase = ''
|
configurePhase = ''
|
||||||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${eigen}/include/eigen*) "
|
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${eigen}/include/eigen*) "
|
||||||
qmake PREFIX="$out"
|
qmake PREFIX="$out" VERSION=${version}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "3D parametric model compiler";
|
description = "3D parametric model compiler";
|
||||||
|
longDescription = ''
|
||||||
|
OpenSCAD is a software for creating solid 3D CAD objects. It is free
|
||||||
|
software and available for Linux/UNIX, MS Windows and Mac OS X.
|
||||||
|
|
||||||
|
Unlike most free software for creating 3D models (such as the famous
|
||||||
|
application Blender) it does not focus on the artistic aspects of 3D
|
||||||
|
modelling but instead on the CAD aspects. Thus it might be the
|
||||||
|
application you are looking for when you are planning to create 3D models of
|
||||||
|
machine parts but pretty sure is not what you are looking for when you are more
|
||||||
|
interested in creating computer-animated movies.
|
||||||
|
'';
|
||||||
homepage = "http://openscad.org/";
|
homepage = "http://openscad.org/";
|
||||||
|
license = stdenv.lib.licenses.gpl2;
|
||||||
platforms = with stdenv.lib.platforms;
|
platforms = with stdenv.lib.platforms;
|
||||||
linux;
|
linux;
|
||||||
maintainers = with stdenv.lib.maintainers;
|
maintainers = with stdenv.lib.maintainers;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user