Fixing the evaluation of the "system tarball pc", adapting it to the latest

nixpkgs changes about 'platform'.


svn path=/nixos/trunk/; revision=20494
This commit is contained in:
Lluís Batlle i Rossell 2010-03-09 14:37:59 +00:00
parent 43d6b17d87
commit 48e9e1282a
2 changed files with 5 additions and 3 deletions

View File

@ -283,7 +283,9 @@ in
# accurate way is unlikely to be better. # accurate way is unlikely to be better.
{ description = "Postfix mail server"; { description = "Postfix mail server";
startOn = "started ${startingDependency}"; startOn = "started ${startingDependency} and filesystems";
daemonType = "fork";
script = script =
'' ''
@ -304,7 +306,7 @@ in
${pkgs.postfix}/sbin/postalias -c /var/postfix/conf /var/postfix/conf/aliases ${pkgs.postfix}/sbin/postalias -c /var/postfix/conf /var/postfix/conf/aliases
${pkgs.postfix}/sbin/postfix -c /var/postfix/conf start exec ${pkgs.postfix}/sbin/postfix -c /var/postfix/conf start
''; # */ ''; # */
}; };

View File

@ -65,7 +65,7 @@ let
in in
tarball // tarball //
{ meta = { { meta = {
description = "NixOS system tarball for ${system} - ${platform.name}"; description = "NixOS system tarball for ${system} - ${stdenv.platform.name}";
maintainers = map (x: lib.getAttr x lib.maintainers) maintainers; maintainers = map (x: lib.getAttr x lib.maintainers) maintainers;
}; };
}; };