diff options
| author | Graham Christensen <graham@grahamc.com> | 2018-06-15 22:20:54 -0400 |
|---|---|---|
| committer | Graham Christensen <graham@grahamc.com> | 2018-06-15 22:20:54 -0400 |
| commit | cbae3d171ba81af4c383f0f6f7f068c1cb11911c (patch) | |
| tree | 591ffc5878295359fb48184c9acf3880679226be /pkgs | |
| parent | ec092b288f9dee4651b14b44a7336d8bfd5f287f (diff) | |
| download | nixpkgs-cbae3d171ba81af4c383f0f6f7f068c1cb11911c.tar nixpkgs-cbae3d171ba81af4c383f0f6f7f068c1cb11911c.tar.gz nixpkgs-cbae3d171ba81af4c383f0f6f7f068c1cb11911c.tar.bz2 nixpkgs-cbae3d171ba81af4c383f0f6f7f068c1cb11911c.tar.lz nixpkgs-cbae3d171ba81af4c383f0f6f7f068c1cb11911c.tar.xz nixpkgs-cbae3d171ba81af4c383f0f6f7f068c1cb11911c.tar.zst nixpkgs-cbae3d171ba81af4c383f0f6f7f068c1cb11911c.zip | |
vsenv, vs90wrapper: delete
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/build-support/vsenv/build-solution.nix | 18 | ||||
| -rw-r--r-- | pkgs/build-support/vsenv/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/compilers/vs90wrapper/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
4 files changed, 0 insertions, 40 deletions
diff --git a/pkgs/build-support/vsenv/build-solution.nix b/pkgs/build-support/vsenv/build-solution.nix deleted file mode 100644 index 32dd06abfaf..00000000000 --- a/pkgs/build-support/vsenv/build-solution.nix +++ /dev/null @@ -1,18 +0,0 @@ -{stdenv, vs}: -{ name -, src -, slnFile -, baseDir ? "." -, extraBuildInputs ? [] -}: - -stdenv.mkDerivation { - inherit name src; - installPhase = '' - cd ${baseDir} - vcbuild.exe /rebuild ${slnFile} - mkdir -p $out - cp Debug/* $out - ''; - buildInputs = [ vs ] ++ extraBuildInputs; -} diff --git a/pkgs/build-support/vsenv/default.nix b/pkgs/build-support/vsenv/default.nix deleted file mode 100644 index 68976253519..00000000000 --- a/pkgs/build-support/vsenv/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{stdenv, vs}: - -{ - buildSolution = import ./build-solution.nix { - inherit stdenv vs; - }; -} diff --git a/pkgs/development/compilers/vs90wrapper/default.nix b/pkgs/development/compilers/vs90wrapper/default.nix deleted file mode 100644 index 341833fdf47..00000000000 --- a/pkgs/development/compilers/vs90wrapper/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{stdenv}: - -stdenv.mkDerivation { - name = "visual-studio-9.0"; - buildCommand = '' - mkdir -p $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 6a15909b01e..0c9de1d9bec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -150,10 +150,6 @@ with pkgs; ebook2cw = callPackage ../applications/misc/ebook2cw { }; - vsenv = callPackage ../build-support/vsenv { - vs = vs90wrapper; - }; - fetchbower = callPackage ../build-support/fetchbower { inherit (nodePackages) bower2nix; }; @@ -7070,8 +7066,6 @@ with pkgs; valadoc = callPackage ../development/tools/valadoc { }; - vs90wrapper = callPackage ../development/compilers/vs90wrapper { }; - wla-dx = callPackage ../development/compilers/wla-dx { }; wrapCCWith = |