diff --git a/pkgs/applications/version-management/cvs-fast-export/default.nix b/pkgs/applications/version-management/cvs-fast-export/default.nix
index ffd583585c0f..3aee0adc6eb6 100644
--- a/pkgs/applications/version-management/cvs-fast-export/default.nix
+++ b/pkgs/applications/version-management/cvs-fast-export/default.nix
@@ -1,31 +1,23 @@
-{lib, stdenv, fetchurl, makeWrapper, flex, bison,
- asciidoc, docbook_xml_dtd_45, docbook_xsl,
- libxml2, libxslt,
- python3, rcs, cvs, git,
- coreutils, rsync}:
-with stdenv; with lib;
-mkDerivation rec {
-  name = "cvs-fast-export-${meta.version}";
-  meta = {
-    version = "1.56";
-    description = "Export an RCS or CVS history as a fast-import stream";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ dfoxfranke ];
-    homepage = "http://www.catb.org/esr/cvs-fast-export/";
-    platforms = platforms.all;
-  };
+{ lib, stdenv, fetchurl, makeWrapper, asciidoc, docbook_xml_dtd_45, docbook_xsl
+, coreutils, cvs, diffutils, findutils, git, python3, rsync
+}:
+
+stdenv.mkDerivation rec {
+  pname = "cvs-fast-export";
+  version = "1.56";
 
   src = fetchurl {
-    url = "http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-1.56.tar.gz";
+    url = "http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-${version}.tar.gz";
     sha256 = "sha256-TB/m7kd91+PyAkGdFCCgeb9pQh0kacq0QuTZa8f9CxU=";
   };
 
-  buildInputs = [
-    flex bison asciidoc docbook_xml_dtd_45 docbook_xsl libxml2 libxslt
-    python3 rcs cvs git makeWrapper
-  ];
+  strictDeps = true;
+  nativeBuildInputs = [ makeWrapper asciidoc ];
+  buildInputs = [ python3 ];
 
-  postPatch = "patchShebangs .";
+  postPatch = ''
+    patchShebangs .
+  '';
 
   preBuild = ''
     makeFlagsArray=(
@@ -35,16 +27,18 @@ mkDerivation rec {
     )
   '';
 
-  doCheck = true;
+  postInstall = ''
+    wrapProgram $out/bin/cvssync --prefix PATH : ${lib.makeBinPath [ rsync ]}
+    wrapProgram $out/bin/cvsconvert --prefix PATH : $out/bin:${lib.makeBinPath [
+      coreutils cvs diffutils findutils git
+    ]}
+  '';
 
-  postInstall =
-    let
-      binpath = makeBinPath [ out rcs cvs git coreutils rsync ];
-    in ''
-      for prog in cvs-fast-export cvsconvert cvssync; do
-        wrapProgram $out/bin/$prog \
-          --prefix PATH : ${binpath}
-      done
-    ''
-  ;
+  meta = with lib; {
+    description = "Export an RCS or CVS history as a fast-import stream";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ dfoxfranke ];
+    homepage = "http://www.catb.org/esr/cvs-fast-export/";
+    platforms = platforms.unix;
+  };
 }