From ee3f276461414d96830a4a84152b259536478ce3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 2 Jan 2020 21:37:35 +0100
Subject: [PATCH] Revert "sudo: fix for structured attrs"

This broke sudo.

This reverts commit 91a1f2043f4b3df24c37e88ee5840499f9258462.
---
 pkgs/tools/security/sudo/default.nix | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix
index d2877a1ff1b..a0922f4df73 100644
--- a/pkgs/tools/security/sudo/default.nix
+++ b/pkgs/tools/security/sudo/default.nix
@@ -41,15 +41,6 @@ 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'
@@ -57,6 +48,7 @@ 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 ];