From cc6acb3e40b134519c4e98f4af53e102de49bb8b Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Tue, 15 Jun 2010 11:32:19 +0000 Subject: [PATCH] Added my very experimental Visual Studio build stuff. You should be even more brave to use this svn path=/nixpkgs/trunk/; revision=22273 --- pkgs/build-support/vsenv/buildSolution.nix | 18 ++++++++++++++++++ pkgs/build-support/vsenv/default.nix | 7 +++++++ .../compilers/vs90wrapper/default.nix | 9 +++++++++ pkgs/top-level/all-packages.nix | 9 +++++++++ 4 files changed, 43 insertions(+) create mode 100644 pkgs/build-support/vsenv/buildSolution.nix create mode 100644 pkgs/build-support/vsenv/default.nix create mode 100644 pkgs/development/compilers/vs90wrapper/default.nix diff --git a/pkgs/build-support/vsenv/buildSolution.nix b/pkgs/build-support/vsenv/buildSolution.nix new file mode 100644 index 00000000000..7d7d6a86e1f --- /dev/null +++ b/pkgs/build-support/vsenv/buildSolution.nix @@ -0,0 +1,18 @@ +{stdenv, vs}: +{ name +, src +, slnFile +, baseDir ? "." +, extraBuildInputs ? [] +}: + +stdenv.mkDerivation { + inherit name src; + installPhase = '' + cd ${baseDir} + vcbuild.exe /rebuild ${slnFile} + ensureDir $out + cp Debug/* $out + ''; + buildInputs = [ vs ] ++ extraBuildInputs; +} diff --git a/pkgs/build-support/vsenv/default.nix b/pkgs/build-support/vsenv/default.nix new file mode 100644 index 00000000000..f0275564ecd --- /dev/null +++ b/pkgs/build-support/vsenv/default.nix @@ -0,0 +1,7 @@ +{stdenv, vs}: + +{ + buildSolution = import ./buildSolution.nix { + inherit stdenv vs; + }; +} diff --git a/pkgs/development/compilers/vs90wrapper/default.nix b/pkgs/development/compilers/vs90wrapper/default.nix new file mode 100644 index 00000000000..47d7c2654a1 --- /dev/null +++ b/pkgs/development/compilers/vs90wrapper/default.nix @@ -0,0 +1,9 @@ +{stdenv}: + +stdenv.mkDerivation { + name = "visual-studio-9.0"; + buildCommand = '' + ensureDir $out/bin + ln -s "/cygdrive/c/Program Files/Microsoft Visual Studio 9.0/VC/vcpackages/vcbuild.exe" $out/bin/vcbuild.exe + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3885784b1a4..87d20d2803b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -235,6 +235,11 @@ let dotnetfx = dotnetfx35; }; + vsenv = import ../build-support/vsenv { + inherit stdenv; + vs = vs90wrapper; + }; + fetchbzr = import ../build-support/fetchbzr { inherit stdenv bazaar; }; @@ -2632,6 +2637,10 @@ let inherit fetchurl stdenv cabextract; }); + vs90wrapper = import ../development/compilers/vs90wrapper { + inherit stdenv; + }; + webdsl = import ../development/compilers/webdsl { inherit stdenv fetchurl pkgconfig strategoPackages; };