From 7e816e90580c85de72b0ab3af04e258796ad4e1d Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Tue, 1 Oct 2013 12:37:13 +0200 Subject: [PATCH] Openscad: Update to 2013.06 (& some coding style fixes) Signed-off-by: Moritz Ulrich --- pkgs/applications/graphics/openscad/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index cf4e7e635d0..d34eeba207c 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -1,9 +1,8 @@ -{stdenv, fetchurl, qt4, bison, flex, eigen, boost, mesa, glew, opencsg, cgal - , mpfr, gmp - }: +{ stdenv, fetchurl, qt4, bison, flex, eigen, boost, mesa, glew, opencsg, cgal +, mpfr, gmp }: stdenv.mkDerivation rec { - version = "2013.01"; + version = "2013.06"; name = "openscad-${version}"; src = fetchurl { @@ -11,7 +10,7 @@ stdenv.mkDerivation rec { 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 = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${eigen}/include/eigen*) " @@ -35,9 +34,8 @@ stdenv.mkDerivation rec { ''; homepage = "http://openscad.org/"; license = stdenv.lib.licenses.gpl2; - platforms = with stdenv.lib.platforms; - linux; + platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; - [raskin bjornfor]; + [ bjornfor raskin the-kenny ]; }; }