Author: eelco
Date: Fri Mar 16 17:20:04 2012
New Revision: 33165
URL: https://nixos.org/websvn/nix/?rev=33165&sc=1
Log:
* Minor cleanup.
Modified:
nixpkgs/trunk/pkgs/servers/portmap/default.nix
Modified: nixpkgs/trunk/pkgs/servers/portmap/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/servers/portmap/default.nix Fri Mar 16 17:15:52
2012 (r33164)
+++ nixpkgs/trunk/pkgs/servers/portmap/default.nix Fri Mar 16 17:20:04
2012 (r33165)
@@ -17,15 +17,14 @@
'';
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
'';
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
