Merge remote-tracking branch 'upstream/master' into staging

3 files changed, 14 insertions, 29 deletions

diff --git a/pkgs/applications/audio/deadbeef/wrapper.nix b/pkgs/applications/audio/deadbeef/wrapper.nix
index b612f195af3f..5b14302204e7 100644
--- a/pkgs/applications/audio/deadbeef/wrapper.nix
+++ b/pkgs/applications/audio/deadbeef/wrapper.nix
@@ -1,22 +1,14 @@
-{ stdenv, buildEnv, deadbeef, makeWrapper, plugins }:
+{ stdenv, symlinkJoin, deadbeef, makeWrapper, plugins }:
 
-let
-drv = buildEnv {
-  name = "deadbeef-with-plugins-" + (builtins.parseDrvName deadbeef.name).version;
+symlinkJoin {
+  name = "deadbeef-with-plugins-${deadbeef.version}";
 
   paths = [ deadbeef ] ++ plugins;
 
+  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 ${deadbeef}/bin/*; do
-        ln -s $i $out/bin
-      done
-    fi
     wrapProgram $out/bin/deadbeef \
       --set DEADBEEF_PLUGIN_DIR "$out/lib/deadbeef"
   '';
-  };
-in stdenv.lib.overrideDerivation drv (x : { buildInputs = x.buildInputs ++ [ makeWrapper ]; })
+}
diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix
index 83367b83e480..d99e2e577ebb 100644
--- a/pkgs/applications/audio/fmit/default.nix
+++ b/pkgs/applications/audio/fmit/default.nix
@@ -9,10 +9,10 @@ assert portaudioSupport -> portaudio != null;
 
 stdenv.mkDerivation rec {
   name = "fmit-${version}";
-  version = "1.0.8";
+  version = "1.0.13";
 
   src = fetchFromGitHub {
-    sha256 = "04s7xcgmi5g58lirr48vf203n1jwdxf981x1p6ysbax24qwhs2kd";
+    sha256 = "04cj70q60sqns68nvw4zfy6078x4cc2q1y2y13z3rs5n80jw27by";
     rev = "v${version}";
     repo = "fmit";
     owner = "gillesdegottex";
diff --git a/pkgs/applications/audio/puredata/wrapper.nix b/pkgs/applications/audio/puredata/wrapper.nix
index 0a30037b2268..9c0a48db51cc 100644
--- a/pkgs/applications/audio/puredata/wrapper.nix
+++ b/pkgs/applications/audio/puredata/wrapper.nix
@@ -1,23 +1,16 @@
-{ stdenv, buildEnv, puredata, makeWrapper, plugins }:
+{ stdenv, symlinkJoin, puredata, makeWrapper, plugins }:
 
 let
 puredataFlags = map (x: "-path ${x}/") plugins;
-drv = buildEnv {
-  name = "puredata-with-plugins-" + (builtins.parseDrvName puredata.name).version;
+in symlinkJoin {
+  name = "puredata-with-plugins-${puredata.version}";
 
   paths = [ puredata ] ++ plugins;
 
+  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 ${puredata}/bin/*; do
-        ln -s $i $out/bin
-      done
-    fi
     wrapProgram $out/bin/pd \
       --add-flags "${toString puredataFlags}"
   '';
-  };
-in stdenv.lib.overrideDerivation drv (x : { buildInputs = x.buildInputs ++ [ makeWrapper ]; })
+}