Merge pull request #15002 from abbradar/symlink-join-wrappers

Use symlinkJoin for wrappers

2 files changed, 8 insertions, 24 deletions

diff --git a/pkgs/tools/cd-dvd/brasero/wrapper.nix b/pkgs/tools/cd-dvd/brasero/wrapper.nix
index 021e0da0e724..839cc1d604e6 100644
--- a/pkgs/tools/cd-dvd/brasero/wrapper.nix
+++ b/pkgs/tools/cd-dvd/brasero/wrapper.nix
@@ -1,22 +1,14 @@
-{ lib, buildEnv, brasero-original, cdrtools, makeWrapper }:
+{ lib, symlinkJoin, brasero-original, cdrtools, makeWrapper }:
 
 let
   binPath = lib.makeBinPath [ cdrtools ];
-in buildEnv {
+in symlinkJoin {
   name = "brasero-${brasero-original.version}";
 
   paths = [ brasero-original ];
   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 ${brasero-original}/bin/*; do
-        ln -s $i $out/bin
-      done
-    fi
     wrapProgram $out/bin/brasero \
       --prefix PATH ':' ${binPath}
   '';
diff --git a/pkgs/tools/inputmethods/fcitx/wrapper.nix b/pkgs/tools/inputmethods/fcitx/wrapper.nix
index a0ae26189541..1e1a2b76a4bb 100644
--- a/pkgs/tools/inputmethods/fcitx/wrapper.nix
+++ b/pkgs/tools/inputmethods/fcitx/wrapper.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildEnv, fcitx, fcitx-configtool, makeWrapper, plugins, kde5 }:
+{ stdenv, symlinkJoin, fcitx, fcitx-configtool, makeWrapper, plugins, kde5 }:
 
 # This is based on the pidgin-with-plugins package.
 # Users should be able to configure what plugins are used
@@ -12,24 +12,16 @@
 #     (fcitx-with-plugins.override { plugins = [ fcitx-anthy ]; })
 # }
 
-let
-drv = buildEnv {
-  name = "fcitx-with-plugins-" + (builtins.parseDrvName fcitx.name).version;
+symlinkJoin {
+  name = "fcitx-with-plugins-${fcitx.version}";
 
   paths = [ fcitx fcitx-configtool kde5.fcitx-qt5 ] ++ 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 ${fcitx}/bin/*; do
-        ln -s $i $out/bin
-      done
-    fi
     wrapProgram $out/bin/fcitx \
       --set FCITXDIR "$out/"
   '';
-  };
-in stdenv.lib.overrideDerivation drv (x : { buildInputs = x.buildInputs ++ [ makeWrapper ]; })
+}