Openscad: Update to 2013.06 (& some coding style fixes)
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
This commit is contained in:
parent
1ca98d7c09
commit
7e816e9058
@ -1,9 +1,8 @@
|
|||||||
{stdenv, fetchurl, 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 = "2013.01";
|
version = "2013.06";
|
||||||
name = "openscad-${version}";
|
name = "openscad-${version}";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
@ -11,7 +10,7 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "01r013l8zyfkgmqn05axh3rlfsjwd6j403w5ffl7nby4i2spiw1f";
|
sha256 = "01r013l8zyfkgmqn05axh3rlfsjwd6j403w5ffl7nby4i2spiw1f";
|
||||||
};
|
};
|
||||||
|
|
||||||
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*) "
|
||||||
@ -35,9 +34,8 @@ stdenv.mkDerivation rec {
|
|||||||
'';
|
'';
|
||||||
homepage = "http://openscad.org/";
|
homepage = "http://openscad.org/";
|
||||||
license = stdenv.lib.licenses.gpl2;
|
license = stdenv.lib.licenses.gpl2;
|
||||||
platforms = with stdenv.lib.platforms;
|
platforms = stdenv.lib.platforms.linux;
|
||||||
linux;
|
|
||||||
maintainers = with stdenv.lib.maintainers;
|
maintainers = with stdenv.lib.maintainers;
|
||||||
[raskin bjornfor];
|
[ bjornfor raskin the-kenny ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user