From 3be3abe6ab5e33ce3ae40d37d41735288c5dda64 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 20 Mar 2009 16:17:08 +0000
Subject: [PATCH] * Removed makePortmap; use makeOverridable.

svn path=/nixpkgs/trunk/; revision=14631
---
 pkgs/servers/portmap/default.nix |  3 ++-
 pkgs/top-level/all-packages.nix  | 12 +++---------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/pkgs/servers/portmap/default.nix b/pkgs/servers/portmap/default.nix
index 5687475d8fdd..9d8a641b4a8a 100644
--- a/pkgs/servers/portmap/default.nix
+++ b/pkgs/servers/portmap/default.nix
@@ -1,10 +1,11 @@
 { fetchurl, stdenv, lib, tcpWrapper
-, daemonUser, daemonUID, daemonGID }:
+, daemonUser ? false, daemonUID ? false, daemonGID ? false }:
 
 assert daemonUser -> (!daemonUID && !daemonGID);
 
 stdenv.mkDerivation rec {
   name = "portmap-6.0";
+  
   src = fetchurl {
     url = "http://neil.brown.name/portmap/${name}.tgz";
     sha256 = "1pj13ll4mbfwjwpn3fbg03qq9im6v2i8fcpa3ffp4viykz9j1j02";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dc03ef594d3f..a53cbdc01e0e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6454,15 +6454,9 @@ let
     inherit fetchurl stdenv apacheHttpd jdk;
   };
 
-  # 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 {};
+  portmap = makeOverridable (import ../servers/portmap) {
+    inherit fetchurl stdenv lib tcpWrapper;
+  };
 
   mysql4 = import ../servers/sql/mysql {
     inherit fetchurl stdenv ncurses zlib perl;