3
0
Fork 0
forked from mirrors/nixpkgs

Add `makePortmap' function, for use by NixOS.

svn path=/nixpkgs/trunk/; revision=11139
This commit is contained in:
Ludovic Courtès 2008-03-15 23:39:18 +00:00
parent fa2f6c5272
commit d9fb721e1a
2 changed files with 11 additions and 10 deletions

View file

@ -17,9 +17,9 @@ stdenv.mkDerivation rec {
makeFlags =
lib.concatStringsSep " "
(lib.optional daemonUser "RPCUSER=\"${daemonUser}\""
++ lib.optional daemonUID "DAEMON_UID=${daemonUID}"
++ lib.optional daemonGID "DAEMON_GID=${daemonGID}");
(lib.optional (daemonUser != false) "RPCUSER=\"${daemonUser}\""
++ lib.optional (daemonUID != false) "DAEMON_UID=${toString daemonUID}"
++ lib.optional (daemonGID != false) "DAEMON_GID=${toString daemonGID}");
buildInputs = [ tcpWrapper ];

View file

@ -3656,14 +3656,15 @@ rec {
inherit fetchurl stdenv apacheHttpd jdk;
};
portmap = import ../servers/portmap {
inherit fetchurl stdenv lib tcpWrapper;
# 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;
});
# This settings should typically be defined by NixOS Upstart job.
daemonUser = false;
daemonGID = false;
daemonUID = false;
};
portmap = (makePortmap);
mysql4 = import ../servers/sql/mysql {
inherit fetchurl stdenv ncurses zlib perl;