From 1f73d89893c78f00c84ce66619f7c586eda51a97 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Tue, 31 May 2016 08:20:31 -0400 Subject: [PATCH] man: use man-old on non-Linux platforms This is a stopgap "fix". See #15849 for more discussion. --- pkgs/top-level/aliases.nix | 1 - pkgs/top-level/all-packages.nix | 5 +++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3f39248d01d0..6a6ec785d7f2 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -65,7 +65,6 @@ doNotDisplayTwice rec { lttngUst = lttng-ust; # added 2014-07-31 manpages = man-pages; # added 2015-12-06 man_db = man-db; # added 2016-05 - man = man-db; # added 2016-05 midoriWrapper = midori; # added 2015-01 mlt-qt5 = qt5.mlt; # added 2015-12-19 module_init_tools = kmod; # added 2016-04-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dbc671c985e7..5db2afb0d827 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2387,6 +2387,11 @@ in makemkv = callPackage ../applications/video/makemkv { }; + # See https://github.com/NixOS/nixpkgs/issues/15849. I'm switching on isLinux because + # it looks like gnulib is broken on non-linux, so it seems likely that this would cause + # trouble on bsd and/or cygwin as well. + man = if stdenv.isLinux then man-db else man-old; + man-old = callPackage ../tools/misc/man { }; man-db = callPackage ../tools/misc/man-db { };