Merge remote-tracking branch 'upstream/master' into HEAD

pkgs/development/tools/misc/texi2html/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, gettext }:
+{ stdenv, fetchurl, perl, gettext, buildPackages }:
 
 stdenv.mkDerivation rec {
   pname = "texi2html";
@@ -9,12 +9,19 @@ stdenv.mkDerivation rec {
     sha256 = "1yprv64vrlcbksqv25asplnjg07mbq38lfclp1m5lj8cw878pag8";
   };
 
-  nativeBuildInputs = [ gettext ];
+  strictDeps = true;
+
+  nativeBuildInputs = [ gettext perl ];
   buildInputs = [ perl ];
 
-  preBuild = ''
-    substituteInPlace separated_to_hash.pl \
-      --replace "/usr/bin/perl" "${perl}/bin/perl"
+  postPatch = ''
+    patchShebangs separated_to_hash.pl
+  '';
+
+  postInstall = stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
+    for f in $out/bin/*; do
+      substituteInPlace $f --replace "${buildPackages.perl}" "${perl}"
+    done
   '';
 
   meta = with stdenv.lib; {