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

svn merge trunk

Browse Source 
svn path=/nixpkgs/branches/libpng15/; revision=29632
This commit is contained in:
Yury G. Kudryashov 2011-10-04 13:33:33 +00:00
commit 935d94c92a
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/development/libraries/dotnetfx40/default.nix Normal file
View File

@ -0,0 +1,23 @@
{stdenv}:
let
windir = "/cygdrive/c/WINDOWS";
in
{
pkg = stdenv.mkDerivation {
name = "dotnetfx-4.0";
src = "${windir}/Microsoft.NET/Framework/v4.0.30319";
buildCommand = ''
ensureDir $out/bin
ln -s $src/MSBuild.exe $out/bin
'';
};
assembly20Path = "/cygdrive/c/WINDOWS/Microsoft.NET/Framework/v2.0.50727";
wcfPath = "/cygdrive/c/WINDOWS/Microsoft.NET/Framework/v3.0/WINDOW~1";
referenceAssembly30Path = "/cygdrive/c/PROGRA~1/REFERE~1/Microsoft/Framework/v3.0";
referenceAssembly35Path = "/cygdrive/c/PROGRA~1/REFERE~1/Microsoft/Framework/v3.5";
}

4
pkgs/top-level/all-packages.nix
View File

@ -241,7 +241,7 @@ let
dotnetenv = import ../build-support/dotnetenv { dotnetenv = import ../build-support/dotnetenv {
inherit stdenv; inherit stdenv;
dotnetfx = dotnetfx35; dotnetfx = dotnetfx40;
}; };
vsenv = callPackage ../build-support/vsenv { vsenv = callPackage ../build-support/vsenv {
@ -592,6 +592,8 @@ let
dotnetfx35 = callPackage ../development/libraries/dotnetfx35 { }; dotnetfx35 = callPackage ../development/libraries/dotnetfx35 { };
dotnetfx40 = callPackage ../development/libraries/dotnetfx40 { };
dropbear = callPackage ../tools/networking/dropbear { dropbear = callPackage ../tools/networking/dropbear {
enableStatic = true; enableStatic = true;
zlib = zlibStatic; zlib = zlibStatic;