diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix
deleted file mode 100644
index 5692fc25a32..00000000000
--- a/pkgs/tools/misc/fzf/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv, fetchFromGitHub, goPackages, syncthing, ncurses }:
-
-with goPackages;
-
-buildGoPackage rec {
-  name = "fzf-${version}";
-  version = "0.10.0";
-  goPackagePath = "github.com/junegunn/fzf";
-  src = fetchFromGitHub {
-    owner = "junegunn";
-    repo = "fzf";
-    rev = "${version}";
-    sha256 = "0dx9qwmcrnh31m2n75qmpj1dxm6rr6xsbazy4nwa3bzrb8y6svh2";
-  };
-
-  buildInputs = with goPackages; [
-    crypto
-    ginkgo
-    gomega
-    junegunn.go-runewidth
-    go-shellwords
-    ncurses
-    syncthing
-    text
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = https://github.com/junegunn/fzf;
-    description = "A command-line fuzzy finder written in Go";
-    license = licenses.mit;
-    maintainers = [ maintainers.magnetophon ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9b09fae5007..bd51242f8c9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -892,7 +892,7 @@ let
 
   filter_audio = callPackage ../development/libraries/filter_audio { };
 
-  fzf = callPackage ../tools/misc/fzf { };
+  fzf = goPackages.fzf.bin // { outputs = [ "bin" ]; };
 
   gist = callPackage ../tools/text/gist { };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 4869363ed04..54043d9c859 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -601,6 +601,17 @@ let
     };
   };
 
+  fzf = buildFromGitHub {
+    rev = "0.10.4";
+    owner = "junegunn";
+    repo = "fzf";
+    sha256 = "06wda8pm1invnj4sfwcicw9qim3jdf9s1fcrai7xqz7wgy74qv1f";
+
+    buildInputs = [
+      crypto ginkgo gomega junegunn.go-runewidth go-shellwords pkgs.ncurses text
+    ];
+  };
+
   g2s = buildFromGitHub {
     rev    = "ec76db4c1ac16400ac0e17ca9c4840e1d23da5dc";
     owner  = "peterbourgon";