From 800489ac403a831e7b4cde448dab7ac03f089c1a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 16 Jul 2009 11:22:37 +0000 Subject: * 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/build-support/make-wrapper/make-wrapper.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'pkgs/build-support/make-wrapper') diff --git a/pkgs/build-support/make-wrapper/make-wrapper.sh b/pkgs/build-support/make-wrapper/make-wrapper.sh index 461f30780ee..08146f37897 100644 --- a/pkgs/build-support/make-wrapper/make-wrapper.sh +++ b/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 -- cgit 1.4.1