* 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

pkgs/applications/networking/browsers/firefox/wrapper.nix

@@ -25,7 +25,7 @@ stdenv.mkDerivation {
     makeWrapper "${browser}/bin/${browserName}" \
         "$out/bin/${browserName}${nameSuffix}" \
         --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
     cp $desktopItem/share/applications/* $out/share/applications

pkgs/build-support/make-wrapper/make-wrapper.sh

@@ -49,13 +49,17 @@ makeWrapper() {
             done
         fi
 
-        if test "$p" = "--suffix-contents"; then
+        if test "$p" = "--suffix-contents" -o "$p" = "--prefix-contents"; then
             varName=${params[$((n + 1))]}
             separator=${params[$((n + 2))]}
             fileNames=${params[$((n + 3))]}
             n=$((n + 3))
             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
         fi