From 257ffc8e73c59deb4583a0f97f0d66cb802707ce Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 13 Oct 2009 09:39:27 +0000
Subject: [PATCH] * Fix broken meta attributes.

svn path=/nixpkgs/trunk/; revision=17773
---
 pkgs/development/interpreters/python/2.5/default.nix |  4 +++-
 pkgs/development/libraries/zziplib/default.nix       |  2 +-
 pkgs/os-specific/linux/net-tools/default.nix         |  2 +-
 pkgs/tools/misc/relfs/cvs.2008.03.05.nix             |  4 ++--
 pkgs/top-level/python-packages.nix                   | 10 +++++-----
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/interpreters/python/2.5/default.nix b/pkgs/development/interpreters/python/2.5/default.nix
index e74ddf2214c1..592915b41df4 100644
--- a/pkgs/development/interpreters/python/2.5/default.nix
+++ b/pkgs/development/interpreters/python/2.5/default.nix
@@ -75,9 +75,11 @@ stdenv.mkDerivation ( {
     opensslSupport = openssl != null;
     tkSupport = (tk != null) && (tcl != null);
     libPrefix = "python2.5";
+  };
 
+  meta = {
     # List of supported platforms.
     #  - On Darwin, `python.exe' fails with "Bus Error".
     platforms = stdenv.lib.platforms.allBut "i686-darwin";
-  } ;
+  };
 } // (if stdenv.system == "i686-darwin" then { NIX_CFLAGS_COMPILE = "-msse2" ; patches = [./search-path.patch ./nolongdouble.patch]; } else {} ) )
diff --git a/pkgs/development/libraries/zziplib/default.nix b/pkgs/development/libraries/zziplib/default.nix
index 1a4e0e78d370..4f8dc30653f9 100644
--- a/pkgs/development/libraries/zziplib/default.nix
+++ b/pkgs/development/libraries/zziplib/default.nix
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
     homepage = http://zziplib.sourceforge.net/;
 
     maintainers = [ stdenv.lib.maintainers.ludo ];
-    platforms = python.passthru.platforms;
+    platforms = python.meta.platforms;
   };
 }
diff --git a/pkgs/os-specific/linux/net-tools/default.nix b/pkgs/os-specific/linux/net-tools/default.nix
index 4b2f6f96d863..59af976a71b4 100644
--- a/pkgs/os-specific/linux/net-tools/default.nix
+++ b/pkgs/os-specific/linux/net-tools/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation {
     homepage = http://www.tazenda.demon.co.uk/phil/net-tools/;
     description = "A set of tools for controlling the network subsystem in Linux";
     license = "GPLv2+";
-    platforms = [ stdenv.lib.platforms.linux ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/tools/misc/relfs/cvs.2008.03.05.nix b/pkgs/tools/misc/relfs/cvs.2008.03.05.nix
index 43b3b9e27b81..640e46d54f10 100644
--- a/pkgs/tools/misc/relfs/cvs.2008.03.05.nix
+++ b/pkgs/tools/misc/relfs/cvs.2008.03.05.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
 	meta = {
 		description = "A relational filesystem on top of FUSE";
 		inherit src;
-    		maintainers = [args.lib.maintainers.raskin];
-		platforms = args.lib.platforms.linux;
+    		maintainers = [args.stdenv.lib.maintainers.raskin];
+		platforms = args.stdenv.lib.platforms.linux;
 	};
 }
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 63849b6c3abe..583d41d4bcdf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -79,7 +79,7 @@ rec {
       license = "MIT";
 
       maintainers = [ stdenv.lib.maintainers.ludo ];
-      platforms = python.passthru.platforms;
+      platforms = python.meta.platforms;
     };
   });
 
@@ -174,7 +174,7 @@ rec {
       license = "revised-BSD";
 
       maintainers = [ stdenv.lib.maintainers.ludo ];
-      platforms = python.passthru.platforms;
+      platforms = python.meta.platforms;
     };
   });
 
@@ -218,7 +218,7 @@ rec {
       license = "GPLv2+";
 
       maintainers = [ stdenv.lib.maintainers.ludo ];
-      platforms = python.passthru.platforms;
+      platforms = python.meta.platforms;
     };
   });
 
@@ -272,7 +272,7 @@ rec {
       license = "revised BSD";
 
       maintainers = [ stdenv.lib.maintainers.ludo ];
-      platforms = python.passthru.platforms;
+      platforms = python.meta.platforms;
     };
   });
 
@@ -395,7 +395,7 @@ rec {
       license = "MIT";
 
       maintainers = [ stdenv.lib.maintainers.ludo ];
-      platforms = python.passthru.platforms;
+      platforms = python.meta.platforms;
     };
   };