diff --git a/pkgs/applications/video/avidemux/wrapper.nix b/pkgs/applications/video/avidemux/wrapper.nix
index 1d1c66cb9fe..7f05b81baec 100644
--- a/pkgs/applications/video/avidemux/wrapper.nix
+++ b/pkgs/applications/video/avidemux/wrapper.nix
@@ -1,4 +1,4 @@
-{ buildEnv, avidemux_unwrapped, makeWrapper
+{ symlinkJoin, avidemux_unwrapped, makeWrapper
 # GTK version is broken upstream, see https://bugzilla.redhat.com/show_bug.cgi?id=1244340
 , withUi ? "qt4"
 }:
@@ -7,24 +7,14 @@ let ui = builtins.getAttr "avidemux_${withUi}" avidemux_unwrapped; in
 
 assert ui.isUi;
 
-buildEnv {
-  name = "avidemux-${withUi}-" + ui.version;
+symlinkJoin {
+  name = "avidemux-${withUi}-${ui.version}";
 
   paths = [ ui avidemux_unwrapped.avidemux_common avidemux_unwrapped.avidemux_settings ];
 
-  ignoreCollisions = true;
-
   buildInputs = [ makeWrapper ];
 
   postBuild = ''
-    # TODO: This could be avoided if buildEnv could be forced to create all directories
-    if [ -L $out/bin ]; then
-      rm $out/bin
-      mkdir $out/bin
-      for i in ${ui}/bin/*; do
-        ln -s $i $out/bin
-      done
-    fi
     for i in $out/bin/*; do
       wrapProgram $i --set ADM_ROOT_DIR $out
     done