svn path=/nixpkgs/branches/stdenv-updates/; revision=13971

This commit is contained in:
Eelco Dolstra 2009-02-03 10:39:48 +00:00
parent debebd8eeb
commit 987c01630a
4 changed files with 15 additions and 12 deletions

View File

@ -1,9 +1,10 @@
{stdenv, fetchurl, kernelHeaders, glibc, libtool, gettext}: {stdenv, fetchurl, kernelHeaders, glibc, libtool, gettext}:
assert stdenv.isLinux; assert stdenv.isLinux && stdenv.system != "powerpc-linux";
stdenv.mkDerivation { stdenv.mkDerivation {
name = "cpufrequtils-005"; name = "cpufrequtils-005";
src = fetchurl { src = fetchurl {
url = http://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils-005.tar.gz; url = http://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils-005.tar.gz;
md5 = "100a8220a546ce61ce943d4107e67db9"; md5 = "100a8220a546ce61ce943d4107e67db9";

View File

@ -1,6 +1,6 @@
{stdenv, fetchurl, kernelHeaders, glibc}: {stdenv, fetchurl, kernelHeaders, glibc}:
assert stdenv.isLinux; assert stdenv.isLinux && stdenv.system != "powerpc-linux";
stdenv.mkDerivation { stdenv.mkDerivation {
name = "iputils-20020927"; name = "iputils-20020927";

View File

@ -1,22 +1,23 @@
{stdenv, fetchurl, db4, glibc {stdenv, fetchurl, db4, glibc, openssl, cyrus_sasl}:
, openssl
, cyrus_sasl
}:
assert stdenv.isLinux; assert stdenv.isLinux && stdenv ? coreutils;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "postfix-2.2.11"; name = "postfix-2.2.11";
src = fetchurl { src = fetchurl {
url = ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/postfix-2.2.11.tar.gz; url = ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/postfix-2.2.11.tar.gz;
sha256 = "04hxpyd3h1f48fnppjwqqxbil13bcwidzpfkra2pgm7h42d9blq7"; sha256 = "04hxpyd3h1f48fnppjwqqxbil13bcwidzpfkra2pgm7h42d9blq7";
}; };
installTargets = ["non-interactive-package"]; installTargets = ["non-interactive-package"];
installFlags = [" install_root=$out "]; installFlags = [" install_root=$out "];
preInstall = "
preInstall = ''
sed -e '/^PATH=/d' -i postfix-install sed -e '/^PATH=/d' -i postfix-install
"; '';
postInstall = '' postInstall = ''
ensureDir $out ensureDir $out
mv ut/$out/* $out/ mv ut/$out/* $out/
@ -44,6 +45,8 @@ stdenv.mkDerivation {
''; '';
buildinputs = [db4 openssl cyrus_sasl]; buildinputs = [db4 openssl cyrus_sasl];
patches = [./postfix-2.2.9-db.patch ./postfix-2.2.9-lib.patch]; patches = [./postfix-2.2.9-db.patch ./postfix-2.2.9-lib.patch];
inherit glibc; inherit glibc;
} }

View File

@ -5806,8 +5806,7 @@ let
}; };
postfix = import ../servers/mail/postfix { postfix = import ../servers/mail/postfix {
inherit fetchurl stdenv db4 openssl cyrus_sasl; inherit fetchurl stdenv db4 openssl cyrus_sasl glibc;
glibc = stdenv.glibc;
}; };
pulseaudio = import ../servers/pulseaudio { pulseaudio = import ../servers/pulseaudio {