From 91a1f2043f4b3df24c37e88ee5840499f9258462 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 15 Nov 2019 11:32:45 +0100
Subject: sudo: fix for structured attrs

---
 pkgs/tools/security/sudo/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix
index a0922f4df73..d2877a1ff1b 100644
--- a/pkgs/tools/security/sudo/default.nix
+++ b/pkgs/tools/security/sudo/default.nix
@@ -41,6 +41,15 @@ stdenv.mkDerivation rec {
     "--with-passprompt=[sudo] password for %p: "  # intentional trailing space
   ];
 
+  installFlags = [
+    "sudoers_uid=$(shell id -u)"
+    "sudoers_gid=$(shell id -g)"
+    "sysconfdir=${placeholder ''out''}/etc"
+    "rundir=$(TMPDIR)/dummy"
+    "vardir=$(TMPDIR)/dummy"
+    "DESTDIR=/"
+  ];
+
   postConfigure =
     ''
     cat >> pathnames.h <<'EOF'
@@ -48,7 +57,6 @@ stdenv.mkDerivation rec {
       #define _PATH_MV "${coreutils}/bin/mv"
     EOF
     makeFlags="install_uid=$(id -u) install_gid=$(id -g)"
-    installFlags="sudoers_uid=$(id -u) sudoers_gid=$(id -g) sysconfdir=$out/etc rundir=$TMPDIR/dummy vardir=$TMPDIR/dummy DESTDIR=/"
     '';
 
   nativeBuildInputs = [ groff ];
-- 
cgit 1.4.1