treewide: Use more makeLibraryPath

2016-08-23 02:56:12 +03:00
parent cf592a8969
commit f064bfe803
9 changed files with 10 additions and 10 deletions
@@ -71,11 +71,11 @@ stdenv.mkDerivation rec {
    
      wrapProgram `pwd`/uiautomatorviewer \
        --prefix PATH : ${jdk}/bin \
-        --prefix LD_LIBRARY_PATH : ${glib}/lib:${gtk}/lib:${libXtst}/lib
+        --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ glib gtk libXtst ]}
    
      wrapProgram `pwd`/hierarchyviewer \
        --prefix PATH : ${jdk}/bin \
-        --prefix LD_LIBRARY_PATH : ${glib}/lib:${gtk}/lib:${libXtst}/lib
+        --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ glib gtk libXtst ]}
      
      # The emulators need additional libraries, which are dynamically loaded => let's wrap them