* Fix broken meta attributes.

svn path=/nixpkgs/trunk/; revision=17773
This commit is contained in:
Eelco Dolstra 2009-10-13 09:39:27 +00:00
parent 64f76f4643
commit 257ffc8e73
5 changed files with 12 additions and 10 deletions

View File

@ -75,9 +75,11 @@ stdenv.mkDerivation ( {
opensslSupport = openssl != null; opensslSupport = openssl != null;
tkSupport = (tk != null) && (tcl != null); tkSupport = (tk != null) && (tcl != null);
libPrefix = "python2.5"; libPrefix = "python2.5";
};
meta = {
# List of supported platforms. # List of supported platforms.
# - On Darwin, `python.exe' fails with "Bus Error". # - On Darwin, `python.exe' fails with "Bus Error".
platforms = stdenv.lib.platforms.allBut "i686-darwin"; platforms = stdenv.lib.platforms.allBut "i686-darwin";
} ; };
} // (if stdenv.system == "i686-darwin" then { NIX_CFLAGS_COMPILE = "-msse2" ; patches = [./search-path.patch ./nolongdouble.patch]; } else {} ) ) } // (if stdenv.system == "i686-darwin" then { NIX_CFLAGS_COMPILE = "-msse2" ; patches = [./search-path.patch ./nolongdouble.patch]; } else {} ) )

View File

@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
homepage = http://zziplib.sourceforge.net/; homepage = http://zziplib.sourceforge.net/;
maintainers = [ stdenv.lib.maintainers.ludo ]; maintainers = [ stdenv.lib.maintainers.ludo ];
platforms = python.passthru.platforms; platforms = python.meta.platforms;
}; };
} }

View File

@ -21,6 +21,6 @@ stdenv.mkDerivation {
homepage = http://www.tazenda.demon.co.uk/phil/net-tools/; homepage = http://www.tazenda.demon.co.uk/phil/net-tools/;
description = "A set of tools for controlling the network subsystem in Linux"; description = "A set of tools for controlling the network subsystem in Linux";
license = "GPLv2+"; license = "GPLv2+";
platforms = [ stdenv.lib.platforms.linux ]; platforms = stdenv.lib.platforms.linux;
}; };
} }

View File

@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "A relational filesystem on top of FUSE"; description = "A relational filesystem on top of FUSE";
inherit src; inherit src;
maintainers = [args.lib.maintainers.raskin]; maintainers = [args.stdenv.lib.maintainers.raskin];
platforms = args.lib.platforms.linux; platforms = args.stdenv.lib.platforms.linux;
}; };
} }

View File

@ -79,7 +79,7 @@ rec {
license = "MIT"; license = "MIT";
maintainers = [ stdenv.lib.maintainers.ludo ]; maintainers = [ stdenv.lib.maintainers.ludo ];
platforms = python.passthru.platforms; platforms = python.meta.platforms;
}; };
}); });
@ -174,7 +174,7 @@ rec {
license = "revised-BSD"; license = "revised-BSD";
maintainers = [ stdenv.lib.maintainers.ludo ]; maintainers = [ stdenv.lib.maintainers.ludo ];
platforms = python.passthru.platforms; platforms = python.meta.platforms;
}; };
}); });
@ -218,7 +218,7 @@ rec {
license = "GPLv2+"; license = "GPLv2+";
maintainers = [ stdenv.lib.maintainers.ludo ]; maintainers = [ stdenv.lib.maintainers.ludo ];
platforms = python.passthru.platforms; platforms = python.meta.platforms;
}; };
}); });
@ -272,7 +272,7 @@ rec {
license = "revised BSD"; license = "revised BSD";
maintainers = [ stdenv.lib.maintainers.ludo ]; maintainers = [ stdenv.lib.maintainers.ludo ];
platforms = python.passthru.platforms; platforms = python.meta.platforms;
}; };
}); });
@ -395,7 +395,7 @@ rec {
license = "MIT"; license = "MIT";
maintainers = [ stdenv.lib.maintainers.ludo ]; maintainers = [ stdenv.lib.maintainers.ludo ];
platforms = python.passthru.platforms; platforms = python.meta.platforms;
}; };
}; };