mingw related stuff

svn path=/nixpkgs/trunk/; revision=18369

pkgs/stdenv/mingw/default.nix

@@ -38,6 +38,7 @@ let {
       shell = msysShell;
       path = [
         (make + "/bin")
+        (tar + "/bin")
         (binutils + "/bin")
         (gccFull + "/bin")
         (mingwRuntimeBin + "/bin")
@@ -77,7 +78,7 @@ let {
            * binutils is on the path because it contains dlltool, which
            * is invoked on the PATH by some packages.
            */
-          initialPath = [make binutils gccFull mingwRuntimeSrc w32apiSrc msys];
+          initialPath = [make tar binutils gccFull mingwRuntimeSrc w32apiSrc msys];
           gcc = gccFull;
           shell = msysShell;
           inherit curl;
@@ -152,7 +153,7 @@ let {
       src =
         fetchurlInit1 {
           url = ftp://ftp.strategoxt.org/pub/mingw/msys-1.0.11.tar.gz;
-          md5 = "85ce547934797019d2d642ec3b53934b";
+          sha256 = "08qp4jk279i66q6ngksg58fx3cfv1r6p5n394h2kfrs56qs9zvz4";
         };
     };
 
@@ -179,6 +180,12 @@ let {
      inherit fetchurl;
    };
 
+  tar =
+   (import ./pkgs).tar {
+     stdenv = stdenvInit2;
+     inherit fetchurl;
+   };
+
   binutils =
    (import ./pkgs).binutils {
      stdenv = stdenvInit2;

pkgs/stdenv/mingw/pkgs/default.nix

@@ -28,6 +28,20 @@ rec {
         };
     };
 
+  /**
+   * Tar
+   */
+  tar = {stdenv, fetchurl} :
+    stdenv.mkDerivation {
+      name = "mingw-tar";
+      builder = ./bin-builder.sh;
+      src = 
+        fetchurl {
+          url = ftp://ftp.strategoxt.org/pub/mingw/tar-1.22-1-msys-1.0.11-bin.tar.gz;
+          sha256 = "17rbv159g56q3bp8rh5vzv8hw8clxs7vk731cgqg0vy1fzls6yfq";
+        };
+    };
+
   /**
    * GCC. Binary
    */
@@ -111,13 +125,13 @@ rec {
    */
   pkgconfigBin =  {stdenv, fetchurl} :
     stdenv.mkDerivation {
-      name = "pkgconfig-0.20";
+      name = "pkgconfig-0.23";
       builder = ./pkgconfig-builder.sh;
       setupHook = ../../../development/tools/misc/pkgconfig/setup-hook.sh;
       src =
         fetchurl {
-          url = http://www.cs.uu.nl/people/martin/pkg-config-0.20-bin.tar.gz;
-          md5 = "71f9595a022619b8e8b0f7853790c4c7";
+          url = ftp://ftp.strategoxt.org/pub/mingw/pkg-config-0.23-bin.tar.gz;
+          sha256 = "1z4zyg20g25qvx102mm2nzsxyh8fcsbz2lgi7qp32b5vrixi1037";
         };
     };