alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

man: use man-old on non-Linux platforms

Browse source 
This is a stopgap "fix". See #15849 for more discussion.
This commit is contained in:
Dan Peebles 2016-05-31 08:20:31 -04:00
parent d47dca41ce
commit 1f73d89893
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkgs/top-level/aliases.nix
View file

@ -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

5
pkgs/top-level/all-packages.nix
View file

@ -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 { };