1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 14:41:17 +00:00

stuff for mingw

svn path=/nixpkgs/trunk/; revision=18339
This commit is contained in:
Rob Vermaas 2009-11-13 11:58:17 +00:00
parent 079451fa9e
commit f26614bb78
2 changed files with 9 additions and 29 deletions

View file

@ -39,7 +39,7 @@ let {
path = [
(make + "/bin")
(binutils + "/bin")
(gccCore + "/bin")
(gccFull + "/bin")
(mingwRuntimeBin + "/bin")
(w32apiBin + "/bin")
(msys + "/bin")
@ -77,8 +77,8 @@ let {
* binutils is on the path because it contains dlltool, which
* is invoked on the PATH by some packages.
*/
initialPath = [make binutils gccCore gccCpp mingwRuntimeSrc w32apiSrc msys];
gcc = gccCore;
initialPath = [make binutils gccFull mingwRuntimeSrc w32apiSrc msys];
gcc = gccFull;
shell = msysShell;
inherit curl;
isDarwin = false;
@ -167,14 +167,8 @@ let {
stdenv = stdenvInit2;
};
gccCore =
(import ./pkgs).gccCore {
stdenv = stdenvInit2;
inherit fetchurl;
};
gccCpp =
(import ./pkgs).gccCpp {
gccFull =
(import ./pkgs).gccFull {
stdenv = stdenvInit2;
inherit fetchurl;
};

View file

@ -31,28 +31,14 @@ rec {
/**
* GCC. Binary
*/
gccCore = {stdenv, fetchurl} :
gccFull = {stdenv, fetchurl} :
stdenv.mkDerivation {
name = "gcc-core-3.4.5-mingw32";
name = "gcc-full-4.4.0-mingw32";
builder = ./bin-builder.sh;
src =
fetchurl {
url = http://surfnet.dl.sourceforge.net/sourceforge/mingw/files/GCC%20Version%203/Current%20Release_%20gcc-3.4.5-20060117-3/gcc-core-3.4.5-20060117-3.tar.gz;
sha256= "1jjj3397fzrly4w0i28mclmawv18g35fak8j8pyr3f34hr1cjwxy";
};
};
/**
* GCC C++. Binary.
*/
gccCpp = {stdenv, fetchurl} :
stdenv.mkDerivation {
name = "gcc-g++-3.4.5-mingw32";
builder = ./bin-builder.sh;
src =
fetchurl {
url = http://surfnet.dl.sourceforge.net/sourceforge/mingw/files/GCC%20Version%203/Current%20Release_%20gcc-3.4.5-20060117-3/gcc-g++-3.4.5-20060117-3.tar.gz;
sha256 = "022g90p0h2jmfsj03vvni1bw3x9z4lbwchwph39bbm1ilk71a66b";
url = ftp://ftp.strategoxt.org/pub/mingw/gcc-full-4.4.0-mingw32-bin-2.tar.gz;
sha256= "6c5a125591837817c940f4c66140cd7393b3f5837dd738c7ed315157e6270a60";
};
};