diff options
| -rw-r--r-- | pkgs/development/interpreters/python/2.5/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/zziplib/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/net-tools/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/misc/relfs/cvs.2008.03.05.nix | 4 | ||||
| -rw-r--r-- | 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 e74ddf2214c..592915b41df 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 1a4e0e78d37..4f8dc30653f 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 4b2f6f96d86..59af976a71b 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 43b3b9e27b8..640e46d54f1 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 63849b6c3ab..583d41d4bcd 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; }; }; |