2 files changed, 28 insertions, 13 deletions
diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix
index 6f131e7abe7..36a674d0880 100644
--- a/pkgs/development/tools/misc/help2man/default.nix
+++ b/pkgs/development/tools/misc/help2man/default.nix
@@ -1,21 +1,35 @@
-{stdenv, fetchurl, perl, gettext, LocaleGettext}:
+{ stdenv, fetchurl, perl, gettext, LocaleGettext, makeWrapper }:
 
-stdenv.mkDerivation {
-  name = "help2man-1.36.1";
+stdenv.mkDerivation rec {
+  name = "help2man-1.40.5";
 
   src = fetchurl {
-    url = http://ftp.gnu.org/gnu/help2man/help2man-1.36.1.tar.gz;
-    sha256 = "13w20lfvggzhvzs9dinxbhwdd61svsacfv9d78zfl9lf1syb5i1f";
+    url = "mirror://gnu/help2man/${name}.tar.gz";
+    sha256 = "1d1wn9krvf9mp97c224710n1pcfh73p7w7na65zn2a06124rln8k";
   };
 
-  buildInputs = [
-    perl
-    gettext
-    LocaleGettext
-  ];
+  buildInputs = [ makeWrapper perl gettext LocaleGettext ];
 
-  # So that configure can find `preloadable_libintl.so'.
-  LD_LIBRARY_PATH = "${gettext}/lib";
+  doCheck = false;                                # target `check' is missing
 
-  inherit gettext;
+  postInstall =
+    '' wrapProgram "$out/bin/help2man" \
+         --prefix PERL5LIB : "$(echo ${LocaleGettext}/lib/perl*/site_perl)"
+    '';
+
+
+  meta = {
+    description = "GNU help2man generates man pages from `--help' output";
+
+    longDescription =
+      '' help2man produces simple manual pages from the ‘--help’ and
+         ‘--version’ output of other commands.
+      '';
+
+    homepage = http://www.gnu.org/software/help2man/;
+
+    license = "GPLv3+";
+    platforms = stdenv.lib.platforms.gnu;         # arbitrary choice
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+  };
 }
diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkgconfig/default.nix
index ae5048f6306..f323a7d7dbc 100644
--- a/pkgs/development/tools/misc/pkgconfig/default.nix
+++ b/pkgs/development/tools/misc/pkgconfig/default.nix
@@ -19,6 +19,7 @@ stdenv.mkDerivation (rec {
   meta = {
     description = "A tool that allows packages to find out information about other packages";
     homepage = http://pkg-config.freedesktop.org/wiki/;
+    platforms = stdenv.lib.platforms.all;
   };
 
 } // (if stdenv.system == "mips64el-linux" then