From ee322d440cf6ea1499b7c0ef04f311c41e572374 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 25 Apr 2013 08:19:55 +0200
Subject: [PATCH 1/3] openscad: bump to 2013.01

Bump to latest release. Use tarball instead of git.
---
 .../applications/graphics/openscad/default.nix | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix
index 9343f3ec135..53fe68f9fa9 100644
--- a/pkgs/applications/graphics/openscad/default.nix
+++ b/pkgs/applications/graphics/openscad/default.nix
@@ -1,19 +1,15 @@
-{stdenv, fetchgit, qt4, bison, flex, eigen, boost, mesa, glew, opencsg, cgal
+{stdenv, fetchurl, qt4, bison, flex, eigen, boost, mesa, glew, opencsg, cgal
   , mpfr, gmp
   }:
 
 stdenv.mkDerivation rec {
-  version = "git-20121213";
+  version = "2013.01";
   name = "openscad-${version}";
-  # src = fetchurl {
-  #   url = "https://github.com/downloads/openscad/openscad/${name}.src.tar.gz";
-  #   sha256 = "0gaqwzxbbzc21lhb4y26j8g0g28dhrwrgkndizp5ddab5axi4zjh";
-  # };
-  src = fetchgit {
-    url = "https://github.com/openscad/openscad.git";
-    rev = "c0612a9ed0899c96963e04c848a59b0164a689a2";
-    sha256  = "1zqiwk1cjbj7sng9sdarbrs0zxkn9fsa84dyv8n0zlyh40s7kvw2";
-  };        
+
+  src = fetchurl {
+    url = "https://openscad.googlecode.com/files/${name}.src.tar.gz";
+    sha256 = "01r013l8zyfkgmqn05axh3rlfsjwd6j403w5ffl7nby4i2spiw1f";
+  };
 
   buildInputs = [qt4 bison flex eigen boost mesa glew opencsg cgal gmp mpfr];
 

From 9f04208116d21dc7e2e542ccfd3b4433cfd96610 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 25 Apr 2013 08:20:49 +0200
Subject: [PATCH 2/3] openscad: add longDescription and license

longDescription is taken from openscad homepage.
---
 pkgs/applications/graphics/openscad/default.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix
index 53fe68f9fa9..1f1bc052a6f 100644
--- a/pkgs/applications/graphics/openscad/default.nix
+++ b/pkgs/applications/graphics/openscad/default.nix
@@ -22,7 +22,19 @@ stdenv.mkDerivation rec {
 
   meta = {
     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/";
+    license = stdenv.lib.licenses.gpl2;
     platforms = with stdenv.lib.platforms;
       linux;
     maintainers = with stdenv.lib.maintainers; 

From 7c3c839fb6d7368409c6a5684088499fc46a58d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 25 Apr 2013 08:28:54 +0200
Subject: [PATCH 3/3] openscad: compile the correct version number

The default version info that is compiled into openscad is the build
date(!). Force the version to the actual release version instead.
---
 pkgs/applications/graphics/openscad/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix
index 1f1bc052a6f..64cbdb0ca9a 100644
--- a/pkgs/applications/graphics/openscad/default.nix
+++ b/pkgs/applications/graphics/openscad/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   configurePhase = ''
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${eigen}/include/eigen*) "
-    qmake PREFIX="$out"
+    qmake PREFIX="$out" VERSION=${version}
   '';
 
   doCheck = false;