From 010edd37395bd092076ec4f9707989d6ba88ceac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 26 May 2009 10:03:33 +0000
Subject: [PATCH] buildPythonPackage: Simplify attribute inheritance.

Suggested by Eelco Dolstra.

svn path=/nixpkgs/trunk/; revision=15731
---
 .../development/python-modules/generic/default.nix | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix
index 91869923be1..e97bf8d9add 100644
--- a/pkgs/development/python-modules/generic/default.nix
+++ b/pkgs/development/python-modules/generic/default.nix
@@ -5,7 +5,7 @@
 
 { python, setuptools, makeWrapper, lib }:
 
-attrs:
+{ name, src, meta, patches ? [], doCheck ? true, ... } @ attrs:
 
 let
     # Return the list of recursively propagated build inputs of PKG.
@@ -20,7 +20,7 @@ let
 in
 
 python.stdenv.mkDerivation rec {
-  inherit (attrs) src meta;
+  inherit src meta patches doCheck;
 
   name = "python-" + attrs.name;
 
@@ -32,18 +32,8 @@ python.stdenv.mkDerivation rec {
      then attrs.propagatedBuildInputs
      else []);
 
-  patches =
-    (if attrs ? patches
-     then attrs.patches
-     else []);
-
   buildPhase = "true";
 
-  doCheck =
-    (if attrs ? doCheck
-     then attrs.doCheck
-     else true);
-
   # Many packages, but not all, support this.
   checkPhase = "python setup.py test";