diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-07-16 11:22:37 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-07-16 11:22:37 +0000 |
| commit | 800489ac403a831e7b4cde448dab7ac03f089c1a (patch) | |
| tree | f5ab5da08797d62d0c092a35a487f184bb1013d9 /pkgs/build-support/make-wrapper | |
| parent | 56b232c4cb5fb452d3597d469845da3ae4e56f8c (diff) | |
| download | nixpkgs-800489ac403a831e7b4cde448dab7ac03f089c1a.tar nixpkgs-800489ac403a831e7b4cde448dab7ac03f089c1a.tar.gz nixpkgs-800489ac403a831e7b4cde448dab7ac03f089c1a.tar.bz2 nixpkgs-800489ac403a831e7b4cde448dab7ac03f089c1a.tar.lz nixpkgs-800489ac403a831e7b4cde448dab7ac03f089c1a.tar.xz nixpkgs-800489ac403a831e7b4cde448dab7ac03f089c1a.tar.zst nixpkgs-800489ac403a831e7b4cde448dab7ac03f089c1a.zip | |
* 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
Diffstat (limited to 'pkgs/build-support/make-wrapper')
| -rw-r--r-- | pkgs/build-support/make-wrapper/make-wrapper.sh | 8 |
1 files changed, 6 insertions, 2 deletions
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 |