Author: sandervanderburg
Date: Tue Sep 13 21:07:08 2011
New Revision: 29260
URL: https://ssl.nixos.org/websvn/nix/?rev=29260&sc=1
Log:
Transitive library dependencies are now propagated
Modified:
nixpkgs/trunk/pkgs/build-support/dotnetenv/build-solution.nix
nixpkgs/trunk/pkgs/build-support/dotnetenv/wrapper.nix
Modified: nixpkgs/trunk/pkgs/build-support/dotnetenv/build-solution.nix
==============================================================================
--- nixpkgs/trunk/pkgs/build-support/dotnetenv/build-solution.nix Tue Sep
13 20:54:02 2011 (r29259)
+++ nixpkgs/trunk/pkgs/build-support/dotnetenv/build-solution.nix Tue Sep
13 21:07:08 2011 (r29260)
@@ -33,7 +33,21 @@
${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 @@
else
assemblySearchPaths="$assemblySearchPaths;$windowsPath"
fi
+
+ addDeps $i
done
echo "Assembly search paths are: $assemblySearchPaths"
Modified: nixpkgs/trunk/pkgs/build-support/dotnetenv/wrapper.nix
==============================================================================
--- nixpkgs/trunk/pkgs/build-support/dotnetenv/wrapper.nix Tue Sep 13
20:54:02 2011 (r29259)
+++ nixpkgs/trunk/pkgs/build-support/dotnetenv/wrapper.nix Tue Sep 13
21:07:08 2011 (r29260)
@@ -28,12 +28,27 @@
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|" \
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
