From a1e834e85ade13317ed51853b600d5df5a870d50 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 6 Aug 2010 10:34:34 +0000 Subject: * Get rid of the ugly `useFromStdenv' hack in all-packages.nix. Instead, use the generic package override mechanism to use packages from earlier bootstrap phases. * Don't rely on the existence of attributes such as `stdenv.coreutils'. svn path=/nixpkgs/trunk/; revision=22991 --- pkgs/servers/mail/postfix/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'pkgs/servers/mail') diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 2a39571a8ff0c..acd3342775f08 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -1,6 +1,8 @@ -{stdenv, fetchurl, db4, glibc, openssl, cyrus_sasl}: +{ stdenv, fetchurl, db4, glibc, openssl, cyrus_sasl +, coreutils, findutils, gnused, gnugrep +}: -assert stdenv.isLinux && stdenv ? coreutils; +assert stdenv.isLinux; stdenv.mkDerivation { name = "postfix-2.2.11"; @@ -24,8 +26,8 @@ stdenv.mkDerivation { mkdir $out/share/postfix/conf cp conf/* $out/share/postfix/conf - sed -e 's@PATH=.*@PATH=${stdenv.coreutils}/bin:${stdenv.findutils}/bin:${stdenv.gnused}/bin:${stdenv.gnugrep}/bin:$out/sbin@' -i $out/share/postfix/conf/post-install - sed -e '2aPATH=${stdenv.coreutils}/bin:${stdenv.findutils}/bin:${stdenv.gnused}/bin:${stdenv.gnugrep}/bin:$out/sbin' -i $out/share/postfix/conf/postfix-script + sed -e 's@PATH=.*@PATH=${coreutils}/bin:${findutils}/bin:${gnused}/bin:${gnugrep}/bin:$out/sbin@' -i $out/share/postfix/conf/post-install + sed -e '2aPATH=${coreutils}/bin:${findutils}/bin:${gnused}/bin:${gnugrep}/bin:$out/sbin' -i $out/share/postfix/conf/postfix-script chmod a+x $out/share/postfix/conf/{postfix-script,post-install} ''; -- cgit 1.4.1