From bc97b365d35afcb25800de54d9668f15352f71ce Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 Dec 2015 10:07:39 +0100
Subject: [PATCH] python pygame: move callPackage to python-packages.nix

---
 pkgs/development/python-modules/pygame/default.nix | 5 ++++-
 pkgs/top-level/all-packages.nix                    | 2 +-
 pkgs/top-level/python-packages.nix                 | 2 ++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix
index 3a24767ae4ee..321a0b49b089 100644
--- a/pkgs/development/python-modules/pygame/default.nix
+++ b/pkgs/development/python-modules/pygame/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, buildPythonPackage, pkgconfig, smpeg, libX11
-, SDL, SDL_image, SDL_mixer, SDL_ttf, libpng, libjpeg, portmidi
+, SDL, SDL_image, SDL_mixer, SDL_ttf, libpng, libjpeg, portmidi, isPy3k,
 }:
 
 buildPythonPackage {
@@ -15,6 +15,9 @@ buildPythonPackage {
     smpeg portmidi libX11
   ];
 
+  # /nix/store/94kswjlwqnc0k2bnwgx7ckx0w2kqzaxj-stdenv/setup: line 73: python: command not found
+  disabled = isPy3k;
+
   patches = [ ./pygame-v4l.patch ];
 
   preConfigure = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a75f13d8ab61..1dfe8cabf1d7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9027,7 +9027,7 @@ let
 
   pyexiv2 = callPackage ../development/python-modules/pyexiv2 { };
 
-  pygame = callPackage ../development/python-modules/pygame { };
+  pygame = pythonPackages.pygame;
 
   pygobject = pythonPackages.pygobject;
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3b683477bc66..4764bca3bfc4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -142,6 +142,8 @@ in modules // {
 
   pycrypto = callPackage ../development/python-modules/pycrypto { };
 
+  pygame = callPackage ../development/python-modules/pygame { };
+
   pygobject = callPackage ../development/python-modules/pygobject { };
 
   pygobject3 = callPackage ../development/python-modules/pygobject/3.nix { };