Add `makePortmap' function, for use by NixOS.

svn path=/nixpkgs/trunk/; revision=11139

1 files changed, 9 insertions, 8 deletions

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2dcb1ee8619..805e656aa99 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3656,14 +3656,15 @@ rec {
     inherit fetchurl stdenv apacheHttpd jdk;
   };
 
-  portmap = import ../servers/portmap {
-    inherit fetchurl stdenv lib tcpWrapper;
-
-    # This settings should typically be defined by NixOS Upstart job.
-    daemonUser = false;
-    daemonGID = false;
-    daemonUID = false;
-  };
+  # This function is typically called by the NixOS Upstart job to specify the
+  # right UID/GID for `portmap'.
+  makePortmap = { daemonUser ? false, daemonGID ? false, daemonUID ? false }:
+    (import ../servers/portmap {
+       inherit fetchurl stdenv lib tcpWrapper
+               daemonUser daemonGID daemonUID;
+     });
+
+  portmap = (makePortmap);
 
   mysql4 = import ../servers/sql/mysql {
     inherit fetchurl stdenv ncurses zlib perl;