From a4e7cc58bb7829c52907c6047ee48720b0a9c544 Mon Sep 17 00:00:00 2001
From: Joe Hermaszewski <git@monoid.al>
Date: Wed, 6 Apr 2016 15:31:04 +0100
Subject: [PATCH 1/2] pythonPackages.cgkit: init at 2.0.0

---
 .../python-modules/cgkit/scons-env.patch      | 22 ++++++++++++++++
 pkgs/top-level/python-packages.nix            | 25 +++++++++++++++++++
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/development/python-modules/cgkit/scons-env.patch

diff --git a/pkgs/development/python-modules/cgkit/scons-env.patch b/pkgs/development/python-modules/cgkit/scons-env.patch
new file mode 100644
index 000000000000..65e9d58a0ae4
--- /dev/null
+++ b/pkgs/development/python-modules/cgkit/scons-env.patch
@@ -0,0 +1,22 @@
+diff --git a/supportlib/SConstruct b/supportlib/SConstruct
+index 7f797b9..07907e9 100644
+--- a/supportlib/SConstruct
++++ b/supportlib/SConstruct
+@@ -5,7 +5,7 @@
+ # library.
+ ######################################################################
+ 
+-import sys, glob, os.path
++import sys, glob, os.path, os
+ 
+ # Read the options
+ vars = Variables("cpp_config.cfg")
+@@ -16,7 +16,7 @@ vars.Add("CPPPATH", "The include directories", [])
+ vars.Add("MSVS_VERSION", "The preferred version of MS Visual Studio")
+ 
+ # Create the construction environment
+-env = Environment(variables = vars)
++env = Environment(variables = vars, ENV = os.environ)
+ 
+ # Build the files in "obj"
+ env.VariantDir("obj", "src", duplicate=0)
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5608f75b15c4..4570586420df 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2946,6 +2946,31 @@ in modules // {
     };
   };
 
+  cgkit = buildPythonPackage rec {
+    version = "2.0.0";
+    name = "cgkit-${version}";
+    disabled = isPy3k;
+
+    src = pkgs.fetchurl {
+      url = "http://downloads.sourceforge.net/project/cgkit/cgkit/cgkit-${version}/cgkit-${version}-py2k.tar.gz";
+      sha256 = "0vvllc42mdyma3c7yqhahs4bfxymm2kvmc4va7dxqr5x0rzh6rd6";
+    };
+
+    patches = [ ../development/python-modules/cgkit/scons-env.patch ];
+
+    buildInputs = with pkgs; [ scons boost mesa ];
+
+    preBuild = ''
+      cd supportlib
+      scons
+      cd -
+    '';
+
+    meta = {
+      homepage = http://cgkit.sourceforge.net;
+      description = "Python Computer Graphics Kit";
+    };
+  };
 
   cheetah = buildPythonPackage rec {
     version = "2.4.4";

From 2be0505b8df56a65e5b19910e3133fd41d5666b7 Mon Sep 17 00:00:00 2001
From: Joe Hermaszewski <git@monoid.al>
Date: Thu, 7 Apr 2016 11:19:08 +0100
Subject: [PATCH 2/2] pythonPackages.cgkit: Add maintenance information

Add @expipiplus as a maintainer.
---
 lib/maintainers.nix                | 1 +
 pkgs/top-level/python-packages.nix | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 09f928be20a8..28b009471e2f 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -114,6 +114,7 @@
   ertes = "Ertugrul Söylemez <ertesx@gmx.de>";
   exi = "Reno Reckling <nixos@reckling.org>";
   exlevan = "Alexey Levan <exlevan@gmail.com>";
+  expipiplus1 = "Joe Hermaszewski <nix@monoid.al>";
   fadenb = "Tristan Helmich <tristan.helmich+nixos@gmail.com>";
   falsifian = "James Cook <james.cook@utoronto.ca>";
   flosse = "Markus Kohlhase <mail@markus-kohlhase.de>";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4570586420df..d46f59b56e07 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2946,6 +2946,7 @@ in modules // {
     };
   };
 
+  # This package is no longer actively maintained and can be removed if it becomes broken.
   cgkit = buildPythonPackage rec {
     version = "2.0.0";
     name = "cgkit-${version}";
@@ -2969,6 +2970,7 @@ in modules // {
     meta = {
       homepage = http://cgkit.sourceforge.net;
       description = "Python Computer Graphics Kit";
+      maintainers = with maintainers; [ expipiplus1 ];
     };
   };