treewide: Use makeLibraryPath in LD_LIBRARY_PATHs

2016-08-23 00:14:00 +03:00
parent 51ad423716
commit d3705faa56
3 changed files with 4 additions and 4 deletions
--- a/pkgs/development/mobile/flashtool/default.nix
+++ b/pkgs/development/mobile/flashtool/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
    sed -i \
      -e 's|$(uname -m)|i686|' \
      -e 's|export JAVA_HOME=.*|export JAVA_HOME=${jre}|' \
-      -e 's|export LD_LIBRARY_PATH=.*|export LD_LIBRARY_PATH=${libXtst}/lib:${glib}/lib:${gtk2}/lib:./x10flasher_lib/linux/lib32|' \
+      -e 's|export LD_LIBRARY_PATH=.*|export LD_LIBRARY_PATH=${stdenv.lib.makeLibraryPath [ libXtst glib gtk2 ]}:./x10flasher_lib/linux/lib32|' \
      FlashTool FlashToolConsole
  '';