deadbeef-with-plugins: use symlinkJoin

+6 -14
+6 -14
pkgs/applications/audio/deadbeef/wrapper.nix
··· 1 - { stdenv, buildEnv, deadbeef, makeWrapper, plugins }: 1 + { stdenv, symlinkJoin, deadbeef, makeWrapper, plugins }: 2 2 3 - let 4 - drv = buildEnv { 5 - name = "deadbeef-with-plugins-" + (builtins.parseDrvName deadbeef.name).version; 3 + symlinkJoin { 4 + name = "deadbeef-with-plugins-${deadbeef.version}"; 6 5 7 6 paths = [ deadbeef ] ++ plugins; 8 7 8 + buildInputs = [ makeWrapper ]; 9 + 9 10 postBuild = '' 10 - # TODO: This could be avoided if buildEnv could be forced to create all directories 11 - if [ -L $out/bin ]; then 12 - rm $out/bin 13 - mkdir $out/bin 14 - for i in ${deadbeef}/bin/*; do 15 - ln -s $i $out/bin 16 - done 17 - fi 18 11 wrapProgram $out/bin/deadbeef \ 19 12 --set DEADBEEF_PLUGIN_DIR "$out/lib/deadbeef" 20 13 ''; 21 - }; 22 - in stdenv.lib.overrideDerivation drv (x : { buildInputs = x.buildInputs ++ [ makeWrapper ]; }) 14 + }