Commit 30872fb8 authored by Sander van der Burg's avatar Sander van der Burg
Browse files

Transitive library dependencies are now propagated 

svn path=/nixpkgs/trunk/; revision=29260
parent 44a72524

pkgs/build-support/dotnetenv/build-solution.nix

+17 −1
Original line number Diff line number Diff line
@@ -34,6 +34,20 @@ stdenv.mkDerivation { 
  '';

  

  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"

pkgs/build-support/dotnetenv/wrapper.nix

+15 −0
Original line number Diff line number Diff line
@@ -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|" \