diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-02 21:37:35 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-02 21:38:33 +0100 |
| commit | ee3f276461414d96830a4a84152b259536478ce3 (patch) | |
| tree | dad85285d570856c9e2f7562576ab9766f6d1c12 /pkgs/tools/security | |
| parent | 853ecd257166e97a05d237407c6451b263154bb7 (diff) | |
| download | nixpkgs-ee3f276461414d96830a4a84152b259536478ce3.tar nixpkgs-ee3f276461414d96830a4a84152b259536478ce3.tar.gz nixpkgs-ee3f276461414d96830a4a84152b259536478ce3.tar.bz2 nixpkgs-ee3f276461414d96830a4a84152b259536478ce3.tar.lz nixpkgs-ee3f276461414d96830a4a84152b259536478ce3.tar.xz nixpkgs-ee3f276461414d96830a4a84152b259536478ce3.tar.zst nixpkgs-ee3f276461414d96830a4a84152b259536478ce3.zip | |
Revert "sudo: fix for structured attrs"
This broke sudo. This reverts commit 91a1f2043f4b3df24c37e88ee5840499f9258462.
Diffstat (limited to 'pkgs/tools/security')
| -rw-r--r-- | pkgs/tools/security/sudo/default.nix | 10 |
1 files changed, 1 insertions, 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 ]; |