diff options
author | John Wiegley <johnw@newartisans.com> | 2014-06-25 17:21:36 -0700 |
---|---|---|
committer | John Wiegley <johnw@newartisans.com> | 2014-06-25 17:21:36 -0700 |
commit | 39db3547a9dba1f5bafbef3807c8781305d2cda1 (patch) | |
tree | 56344690cb65e1000f250a6053c035b78b08b647 /pkgs/tools/security | |
parent | 32bca3976f0369d1ee8442e307ddcce6368199b8 (diff) | |
parent | fbfdc8e2dcabd2bef9011a69b0bb080abc8f7a2a (diff) | |
download | nixlib-39db3547a9dba1f5bafbef3807c8781305d2cda1.tar nixlib-39db3547a9dba1f5bafbef3807c8781305d2cda1.tar.gz nixlib-39db3547a9dba1f5bafbef3807c8781305d2cda1.tar.bz2 nixlib-39db3547a9dba1f5bafbef3807c8781305d2cda1.tar.lz nixlib-39db3547a9dba1f5bafbef3807c8781305d2cda1.tar.xz nixlib-39db3547a9dba1f5bafbef3807c8781305d2cda1.tar.zst nixlib-39db3547a9dba1f5bafbef3807c8781305d2cda1.zip |
Merge pull request #3055 from chrisfarms/fix-sudo
Fix sudo installation issue #3027
Diffstat (limited to 'pkgs/tools/security')
-rw-r--r-- | pkgs/tools/security/sudo/default.nix | 40 |
1 files changed, 22 insertions, 18 deletions
diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index b4c2d7f1c1fa..ab46af5a1cd9 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -11,39 +11,43 @@ stdenv.mkDerivation rec { sha256 = "002l6h27pnhb77b65frhazbhknsxvrsnkpi43j7i0qw1lrgi7nkf"; }; - postConfigure = '' - cat >> pathnames.h <<EOF - #undef _PATH_SUDO_LOGFILE - #define _PATH_SUDO_LOGFILE "/var/log/sudo.log" - #undef _PATH_SUDO_TIMEDIR - #define _PATH_SUDO_TIMEDIR "/run/sudo" - #undef _PATH_VI - #define _PATH_VI "/run/current-system/sw/bin/nano" - #undef _PATH_MV - #define _PATH_MV "${coreutils}/bin/mv" + configureFlags = [ + "--with-env-editor" + "--with-editor=/run/current-system/sw/bin/nano" + "--with-rundir=/var/run" + "--with-vardir=/var/db/sudo" + "--with-logpath=/var/log/sudo.log" + ]; + + postConfigure = + '' + cat >> pathnames.h <<'EOF' + #undef _PATH_MV + #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 timedir=$TMPDIR/dummy" - ''; + installFlags="sudoers_uid=$(id -u) sudoers_gid=$(id -g) sysconfdir=$out/etc rundir=$TMPDIR/dummy vardir=$TMPDIR/dummy" + ''; buildInputs = [ coreutils pam groff ]; enableParallelBuilding = true; - postInstall = '' - rm $out/share/doc/sudo/ChangeLog - ''; + postInstall = + '' + rm -f $out/share/doc/sudo/ChangeLog + ''; meta = { description = "A command to run commands as root"; - longDescription = '' + longDescription = + '' Sudo (su "do") allows a system administrator to delegate authority to give certain users (or groups of users) the ability to run some (or all) commands as root or another user while providing an audit trail of the commands and their arguments. - ''; + ''; homepage = http://www.sudo.ws/; |