diff --git a/pkgs/applications/audio/tunefish/default.nix b/pkgs/applications/audio/tunefish/default.nix
index a953f5960122..9f5772e5d8e1 100644
--- a/pkgs/applications/audio/tunefish/default.nix
+++ b/pkgs/applications/audio/tunefish/default.nix
@@ -15,22 +15,23 @@
   webkitgtk_4_0,
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "tunefish";
-  version = "unstable-2020-08-13";
+  version = "0-unstable-2021-12-19";
 
   src = fetchFromGitHub {
     owner = "jpcima";
     repo = "tunefish";
-    rev = "b3d83cc66201619f6399500f6897fbeb1786d9ed";
+    rev = "c801c6cab63bb9e78e38ed69bd92024f2c667f00";
+    hash = "sha256-ZH2VD0IydEFdbB3Ht5D6/lbcWLQHBuu9GyasVP7VefI=";
     fetchSubmodules = true;
-    sha256 = "0rjpq3s609fblzkvnc9729glcnfinmxljh0z8ldpzr245h367zxh";
   };
 
   nativeBuildInputs = [
     pkg-config
     python3
   ];
+
   buildInputs = [
     alsa-lib
     curl
@@ -43,28 +44,40 @@ stdenv.mkDerivation {
     webkitgtk_4_0
   ];
 
-  postPatch = ''
-    patchShebangs src/tunefish4/generate-lv2-ttl.py
-  '';
-
   makeFlags = [
     "-C"
     "src/tunefish4/Builds/LinuxMakefile"
     "CONFIG=Release"
   ];
 
+  # silences build warnings
+  HOME = "/build";
+
+  postPatch = ''
+    patchShebangs src/tunefish4/generate-lv2-ttl.py
+  '';
+
   installPhase = ''
-    mkdir -p $out/lib/lv2
-    cp -r src/tunefish4/Builds/LinuxMakefile/build/Tunefish4.lv2 $out/lib/lv2
+    runHook preInstall
+
+    mkdir -p $out/lib/{lv2,vst,vst3/Tunefish4.vst3}
+
+    pushd src/tunefish4/Builds/LinuxMakefile/build
+    cp -r "Tunefish4.lv2" $out/lib/lv2
+    cp -r "Tunefish4.vst3/Contents/x86_64-linux"/* $out/lib/vst3/Tunefish4.vst3
+    cp "Tunefish4.so" $out/lib/vst
+    popd
+
+    runHook postInstall
   '';
 
   enableParallelBuilding = true;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://tunefish-synth.com/";
     description = "Virtual analog synthesizer LV2 plugin";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ orivej ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ orivej ];
     platforms = [ "x86_64-linux" ];
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 528c5310c1d7..d77221a8bf96 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16389,9 +16389,7 @@ with pkgs;
 
   trojita = libsForQt5.callPackage ../applications/networking/mailreaders/trojita { };
 
-  tunefish = callPackage ../applications/audio/tunefish {
-    stdenv = clangStdenv; # https://github.com/jpcima/tunefish/issues/4
-  };
+  tunefish = callPackage ../applications/audio/tunefish { };
 
   tuxclocker = libsForQt5.callPackage ../applications/misc/tuxclocker {
     tuxclocker-plugins = tuxclocker-plugins-with-unfree;