From 1148fc2f76f1f3a02ee64e96a833e980b461aca3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 16 Mar 2012 17:20:04 +0000
Subject: * Minor cleanup.

svn path=/nixpkgs/trunk/; revision=33165
---
 pkgs/servers/portmap/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/portmap/default.nix b/pkgs/servers/portmap/default.nix
index aaa9bb684f4e..52635b5818f0 100644
--- a/pkgs/servers/portmap/default.nix
+++ b/pkgs/servers/portmap/default.nix
@@ -17,15 +17,14 @@ stdenv.mkDerivation rec {
   '';
 
   makeFlags =
-   lib.concatStringsSep " "
-     (lib.optional (daemonUser != false) "RPCUSER=\"${daemonUser}\""
-      ++ lib.optional (daemonUID != false) "DAEMON_UID=${toString daemonUID}"
-      ++ lib.optional (daemonGID != false) "DAEMON_GID=${toString 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 ];
 
   installPhase = ''
-    mkdir -p "$out/sbin" && ensureDir "$out/man/man8" && \
+    mkdir -p "$out/sbin" "$out/man/man8"
     make install BASEDIR=$out
   '';
 
-- 
cgit 1.4.1