forked from mirrors/nixpkgs
* Firefox wrapper: put gecko-mediaplayer and mplayer at the start of
$PATH rather than the end. This makes the behaviour more predictable. svn path=/nixpkgs/trunk/; revision=16390
This commit is contained in:
parent
56b232c4cb
commit
800489ac40
pkgs
|
@ -25,7 +25,7 @@ stdenv.mkDerivation {
|
||||||
makeWrapper "${browser}/bin/${browserName}" \
|
makeWrapper "${browser}/bin/${browserName}" \
|
||||||
"$out/bin/${browserName}${nameSuffix}" \
|
"$out/bin/${browserName}${nameSuffix}" \
|
||||||
--suffix-each MOZ_PLUGIN_PATH ':' "$plugins" \
|
--suffix-each MOZ_PLUGIN_PATH ':' "$plugins" \
|
||||||
--suffix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))"
|
--prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))"
|
||||||
|
|
||||||
ensureDir $out/share/applications
|
ensureDir $out/share/applications
|
||||||
cp $desktopItem/share/applications/* $out/share/applications
|
cp $desktopItem/share/applications/* $out/share/applications
|
||||||
|
|
|
@ -49,13 +49,17 @@ makeWrapper() {
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "$p" = "--suffix-contents"; then
|
if test "$p" = "--suffix-contents" -o "$p" = "--prefix-contents"; then
|
||||||
varName=${params[$((n + 1))]}
|
varName=${params[$((n + 1))]}
|
||||||
separator=${params[$((n + 2))]}
|
separator=${params[$((n + 2))]}
|
||||||
fileNames=${params[$((n + 3))]}
|
fileNames=${params[$((n + 3))]}
|
||||||
n=$((n + 3))
|
n=$((n + 3))
|
||||||
for fileName in $fileNames; do
|
for fileName in $fileNames; do
|
||||||
echo "export $varName=\$$varName\${$varName:+$separator}$(cat $fileName)" >> $wrapper
|
if test "$p" = "--suffix-contents"; then
|
||||||
|
echo "export $varName=\$$varName\${$varName:+$separator}$(cat $fileName)" >> $wrapper
|
||||||
|
else
|
||||||
|
echo "export $varName=$(cat $fileName)\${$varName:+$separator}\$$varName" >> $wrapper
|
||||||
|
fi
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue