summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2016-01-28 13:55:37 +0100
committerVladimír Čunát <vcunat@gmail.com>2016-01-28 13:55:37 +0100
commitc9790126312119ce5a2a8ac946d9f086e7ea9f55 (patch)
tree42c620c93ad6278633d7d68b34a0e4e29cbc7e93 /pkgs
parent363f667e8b9cb60ad3def1854d868d0ecfdbe7ea (diff)
downloadnixpkgs-c9790126312119ce5a2a8ac946d9f086e7ea9f55.tar
nixpkgs-c9790126312119ce5a2a8ac946d9f086e7ea9f55.tar.gz
nixpkgs-c9790126312119ce5a2a8ac946d9f086e7ea9f55.tar.bz2
nixpkgs-c9790126312119ce5a2a8ac946d9f086e7ea9f55.tar.lz
nixpkgs-c9790126312119ce5a2a8ac946d9f086e7ea9f55.tar.xz
nixpkgs-c9790126312119ce5a2a8ac946d9f086e7ea9f55.tar.zst
nixpkgs-c9790126312119ce5a2a8ac946d9f086e7ea9f55.zip
man-only packages: fixup after stdenv changes
Thanks to @avnik for notification.
The stdenv now auto-removes developer-only documentation
unless explicitly indicated, which wasn't a good fit for these packages.
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/data/documentation/man-pages/default.nix3
-rw-r--r--pkgs/data/documentation/std-man-pages/default.nix4
-rw-r--r--pkgs/data/documentation/stdman/default.nix4
3 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix
index 5800b429ae4..2635de05a26 100644
--- a/pkgs/data/documentation/man-pages/default.nix
+++ b/pkgs/data/documentation/man-pages/default.nix
@@ -9,7 +9,10 @@ stdenv.mkDerivation rec {
     sha256 = "0v8zxq4scfixy3pjpw9ankvv5v8frv62khv4xm1jpkswyq6rbqcg";
   };
 
+  # keep developer docs separately (man2 and man3)
+  outputs = [ "out" "docdev" ];
   makeFlags = [ "MANDIR=$(out)/share/man" ];
+  postFixup = ''moveToOutput share/man/man2 "$docdev" '';
 
   meta = with stdenv.lib; {
     inherit version;
diff --git a/pkgs/data/documentation/std-man-pages/default.nix b/pkgs/data/documentation/std-man-pages/default.nix
index 3b45da914d2..c438f839dbd 100644
--- a/pkgs/data/documentation/std-man-pages/default.nix
+++ b/pkgs/data/documentation/std-man-pages/default.nix
@@ -2,12 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "std-man-pages-4.4.0";
-  
+
   src = fetchurl {
     url = mirror://gcc/libstdc++/doxygen/libstdc++-man.4.4.0.tar.bz2;
     sha256 = "0153py77ll759jacq41dp2z2ksr08pdcfic0rwjd6pr84dk89y9v";
   };
 
+  outputDocdev = "out";
+
   installPhase = ''
     mkdir -p $out/share/man
     cp -R * $out/share/man
diff --git a/pkgs/data/documentation/stdman/default.nix b/pkgs/data/documentation/stdman/default.nix
index 33c002e9801..249e5b6841b 100644
--- a/pkgs/data/documentation/stdman/default.nix
+++ b/pkgs/data/documentation/stdman/default.nix
@@ -11,13 +11,15 @@ stdenv.mkDerivation rec {
     sha256 = "09c5gjhcz97ghfrv9zkgfb1wckvmqnhbzga0xidbm1ir7640di8l";
   };
 
+  outputDocdev = "out";
+
   preConfigure = "
     patchShebangs ./configure
     patchShebangs ./do_install
   ";
 
   buildInputs = [ curl ];
-  
+
   meta = with stdenv.lib; {
     description = "Formatted C++11/14 stdlib man pages (cppreference)";
     longDescription = "stdman is a tool that parses archived HTML