From 48e9e1282ad65329007478453118cc695bf3577c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 9 Mar 2010 14:37:59 +0000
Subject: [PATCH] Fixing the evaluation of the "system tarball pc", adapting it
 to the latest nixpkgs changes about 'platform'.

svn path=/nixos/trunk/; revision=20494
---
 modules/services/mail/postfix.nix | 6 ++++--
 release.nix                       | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/services/mail/postfix.nix b/modules/services/mail/postfix.nix
index ae85dd43f23..93596028678 100644
--- a/modules/services/mail/postfix.nix
+++ b/modules/services/mail/postfix.nix
@@ -283,7 +283,9 @@ in
       # accurate way is unlikely to be better.
       { description = "Postfix mail server";
 
-        startOn = "started ${startingDependency}";
+        startOn = "started ${startingDependency} and filesystems";
+
+        daemonType = "fork";
 
         script =
           ''
@@ -304,7 +306,7 @@ in
 
             ${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
           ''; # */
 
       };
diff --git a/release.nix b/release.nix
index e565e5b1d83..a0144cc7536 100644
--- a/release.nix
+++ b/release.nix
@@ -65,7 +65,7 @@ let
     in
       tarball //
         { 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;
           };
         };