colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* F-spot: work properly if an incompatible Mono is in the PATH.

Browse Source 
svn path=/nixpkgs/trunk/; revision=2392
This commit is contained in:
Eelco Dolstra 2005-03-13 20:43:04 +00:00
parent a93b037be8
commit df2a7e5168
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/graphics/f-spot/builder.sh
View File

@ -10,10 +10,10 @@ postInstall() {
echo "wrapping $(basename $i)"
# !!! TODO: figure out the MONO_GAC_PREFIX automatically
makeWrapper "$i" "$out/bin/$(basename $i)" \
--suffix PATH ':' "$(dirname $(type -p mono))" \
--suffix LD_LIBRARY_PATH ':' "$sqlite/lib" \
--suffix LD_LIBRARY_PATH ':' "$libgnomeui/lib/libglade/2.0" \
--suffix MONO_GAC_PREFIX ':' "$gtksharp"
--prefix PATH ':' "$(dirname $(type -p mono))" \
--prefix LD_LIBRARY_PATH ':' "$sqlite/lib" \
--prefix LD_LIBRARY_PATH ':' "$libgnomeui/lib/libglade/2.0" \
--prefix MONO_GAC_PREFIX ':' "$gtksharp"
done
# !!! hack

8
pkgs/build-support/make-wrapper/make-wrapper.sh
View File

@ -17,13 +17,17 @@ makeWrapper() {
echo "export $varName=$value" >> $wrapper
fi
if test "$p" = "--suffix"; then
if test "$p" = "--suffix" -o "$p" = "--prefix"; then
varName=${params[$((n + 1))]}
separator=${params[$((n + 2))]}
value=${params[$((n + 3))]}
n=$((n + 3))
if test -n "$value"; then
echo "export $varName=\$$varName\${$varName:+$separator}$value" >> $wrapper
if test "$p" = "--suffix"; then
echo "export $varName=\$$varName\${$varName:+$separator}$value" >> $wrapper
else
echo "export $varName=$value\${$varName:+$separator}\$$varName" >> $wrapper
fi
fi
fi