treewide: Use makeBinPath

2016-08-23 01:18:10 +03:00
parent c255395219
commit 74a3a2cd7e
65 changed files with 71 additions and 71 deletions
@@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
        --set GCONF_CONFIG_SOURCE 'xml::~/.gconf'                       \
        --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share/gsettings-schemas/${name}" \
        --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules"  \
-        --prefix PATH ":" "$out/bin:${perl}/bin:${gconf}/bin"
+        --prefix PATH ":" "$out/bin:${stdenv.lib.makeBinPath [ perl gconf ]}"
    done

    rm $out/share/icons/hicolor/icon-theme.cache
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
        --prefix LD_LIBRARY_PATH ":" "${libbonoboui}/lib/libglade/2.0"  \
        --prefix PERL5LIB ":" "$PERL5LIB"                               \
        --set GCONF_CONFIG_SOURCE 'xml::~/.gconf'                       \
-        --prefix PATH ":" "$out/bin:${perl}/bin:${gconf}/bin"
+        --prefix PATH ":" "$out/bin:${stdenv.lib.makeBinPath [ perl gconf ]}"
    done

    rm $out/share/icons/hicolor/icon-theme.cache