diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-12-27 12:43:04 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-12-27 20:53:53 +0100 |
| commit | 34a7256820fe8c504ff519377c8ab2a9ac068ebb (patch) | |
| tree | f24f51762852231e22b0e8af81b38ecfd783f258 /pkgs/tools/misc/coreutils | |
| parent | 7d648e3b7fe2fa9fb076b3d237a301420434c24b (diff) | |
| download | nixlib-34a7256820fe8c504ff519377c8ab2a9ac068ebb.tar nixlib-34a7256820fe8c504ff519377c8ab2a9ac068ebb.tar.gz nixlib-34a7256820fe8c504ff519377c8ab2a9ac068ebb.tar.bz2 nixlib-34a7256820fe8c504ff519377c8ab2a9ac068ebb.tar.lz nixlib-34a7256820fe8c504ff519377c8ab2a9ac068ebb.tar.xz nixlib-34a7256820fe8c504ff519377c8ab2a9ac068ebb.tar.zst nixlib-34a7256820fe8c504ff519377c8ab2a9ac068ebb.zip | |
coreutils: fix build (race condition)
Diffstat (limited to 'pkgs/tools/misc/coreutils')
| -rw-r--r-- | pkgs/tools/misc/coreutils/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/misc/coreutils/help2man.patch | 40 |
2 files changed, 42 insertions, 0 deletions
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index ebd68ee9cf68..e5f9eb1be2c0 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -18,6 +18,8 @@ let sha256 = "064f512185iysqqcvhnhaf3bfmzrvcgs7n405qsyp99zmfyl9amd"; }; + patches = [ ./help2man.patch ]; + nativeBuildInputs = [ perl ]; buildInputs = [ gmp ] ++ optional aclSupport acl diff --git a/pkgs/tools/misc/coreutils/help2man.patch b/pkgs/tools/misc/coreutils/help2man.patch new file mode 100644 index 000000000000..9f3cbaa40ff1 --- /dev/null +++ b/pkgs/tools/misc/coreutils/help2man.patch @@ -0,0 +1,40 @@ +Although the above man pages depend on src/md5sum.c as a shared +source, the build of the man pages directly requires their own +executables to exist. + +* man/local.mk (man/sha1sum.1): Change the dependency from +'src/md5sum' to 'src/sha1sum'. +(man/sha224sum.1): s/md5sum/sha224sum/ +(man/sha256sum.1): s/md5sum/sha256sum/ +(man/sha384sum.1): s/md5sum/sha384sum/ +(man/sha512sum.1): s/md5sum/sha512sum/ + +Reported by Pádraig Brady in +http://lists.gnu.org/archive/html/coreutils/2013-11/msg00006.html +--- + man/local.mk | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/man/local.mk b/man/local.mk +index 266b780..45dbcb9 100644 +--- a/man/local.mk ++++ b/man/local.mk +@@ -131,11 +131,11 @@ man/rm.1: src/rm + man/rmdir.1: src/rmdir + man/runcon.1: src/runcon + man/seq.1: src/seq +-man/sha1sum.1: src/md5sum +-man/sha224sum.1: src/md5sum +-man/sha256sum.1: src/md5sum +-man/sha384sum.1: src/md5sum +-man/sha512sum.1: src/md5sum ++man/sha1sum.1: src/sha1sum ++man/sha224sum.1: src/sha224sum ++man/sha256sum.1: src/sha256sum ++man/sha384sum.1: src/sha384sum ++man/sha512sum.1: src/sha512sum + man/shred.1: src/shred + man/shuf.1: src/shuf + man/sleep.1: src/sleep +-- +1.8.3.1 |