Transitive library dependencies are now propagated

svn path=/nixpkgs/trunk/; revision=29260
This commit is contained in:
Sander van der Burg 2011-09-13 21:07:08 +00:00
parent 44a7252405
commit 30872fb8cc
2 changed files with 32 additions and 1 deletions

View file

@ -33,7 +33,21 @@ stdenv.mkDerivation {
${preBuild}
'';
installPhase = ''
installPhase = ''
addDeps()
{
if [ -f $1/nix-support/dotnet-assemblies ]
then
for i in $(cat $1/nix-support/dotnet-assemblies)
do
windowsPath=$(cygpath --windows $i)
assemblySearchPaths="$assemblySearchPaths;$windowsPath"
addDeps $i
done
fi
}
for i in ${toString assemblyInputs}
do
windowsPath=$(cygpath --windows $i)
@ -45,6 +59,8 @@ stdenv.mkDerivation {
else
assemblySearchPaths="$assemblySearchPaths;$windowsPath"
fi
addDeps $i
done
echo "Assembly search paths are: $assemblySearchPaths"

View file

@ -28,12 +28,27 @@ dotnetenv.buildSolution {
slnFile = "Wrapper.sln";
assemblyInputs = [ application ];
preBuild = ''
addRuntimeDeps()
{
if [ -f $1/nix-support/dotnet-assemblies ]
then
for i in $(cat $1/nix-support/dotnet-assemblies)
do
windowsPath=$(cygpath --windows $i | sed 's|\\|\\\\|g')
assemblySearchArray="$assemblySearchArray @\"$windowsPath\""
addRuntimeDeps $i
done
fi
}
export exePath=$(cygpath --windows $(find ${application} -name \*.exe) | sed 's|\\|\\\\|g')
# Generate assemblySearchPaths string array contents
for path in ${toString assemblyInputs}
do
assemblySearchArray="$assemblySearchArray @\"$(cygpath --windows $path | sed 's|\\|\\\\|g')\", "
addRuntimeDeps $path
done
sed -e "s|@ROOTNAMESPACE@|${namespace}Wrapper|" \