From ac51528df83401ff357d08ee69d31b5a6d421279 Mon Sep 17 00:00:00 2001 From: danbst Date: Wed, 30 Nov 2016 01:44:28 +0200 Subject: shadow: fix collision with coreutils (man groups.1.gz) The `groups.1.gz` collides with one from coreutils. The code to fix this was already present in expression, but wrongly assumes that share/man/man1 directory will be copied to `man` output after `installPhase`. It turned out, that man directory is set at configure step, so we should remove file from `man` output. --- pkgs/os-specific/linux/shadow/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs/os-specific/linux/shadow') diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix index e56f285d526..e99d7d86bfb 100644 --- a/pkgs/os-specific/linux/shadow/default.nix +++ b/pkgs/os-specific/linux/shadow/default.nix @@ -43,7 +43,8 @@ stdenv.mkDerivation rec { postInstall = '' # Don't install ‘groups’, since coreutils already provides it. - rm $out/bin/groups $out/share/man/man1/groups.* + rm $out/bin/groups + rm $man/share/man/man1/groups.* # Move the su binary into the su package mkdir -p $su/bin -- cgit 1.4.1