Fixing the gcc-wrapper, so it does not link when gcc is called with '-x

something'.
It should not link at least for '-x c-header' and '-x c++-header', and maybe
link for '-x c' or '-x c++', but we expect noone will be linking using these
later strings.

Adding opencv, which required '-x c-header' working, and that's why I have
updated gcc wrapper.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19491

pkgs/build-support/gcc-wrapper/gcc-wrapper.sh

@@ -30,6 +30,10 @@ for i in "$@"; do
         dontLink=1
     elif test "$i" = "-MM"; then
         dontLink=1
+    elif test "$i" = "-x"; then
+        # At least for the cases c-header or c++-header we should set dontLink.
+        # I expect no one use -x other than making precompiled headers.
+        dontLink=1
     elif test "${i:0:1}" != "-"; then
         nonFlagArgs=1
     elif test "$i" = "-m32"; then

pkgs/development/libraries/opencv/default.nix

@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, cmake, gtk, glib, libjpeg, libpng, libtiff, jasper, ffmpeg, pkgconfig,
+  xineLib, gstreamer }:
+
+stdenv.mkDerivation rec {
+  name = "opencv-2.0.0";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/opencvlibrary/OpenCV-2.0.0.tar.bz2";
+    sha256 = "08h03qzawj6zwifrh8rq66y4cya1kxx9ixrbq7phlac79nbvjzf1";
+  };
+
+  buildInputs = [ cmake gtk glib libjpeg libpng libtiff jasper ffmpeg pkgconfig
+    xineLib gstreamer ];
+
+  meta = {
+    description = "Open Computer Vision Library with more than 500 algorithms";
+    homepage = http://opencv.willowgarage.com/;
+    license = "BSD";
+  };
+}

pkgs/top-level/all-packages.nix

@@ -4540,6 +4540,13 @@ let
     inherit fetchurl stdenv libtool pcsclite libusb pkgconfig;
   };
 
+  opencv = import ../development/libraries/opencv {
+      inherit fetchurl stdenv cmake libjpeg libpng libtiff jasper ffmpeg
+          pkgconfig xineLib;
+      inherit (gtkLibs) gtk glib;
+      inherit (gst_all) gstreamer;
+  };
+
   # this ctl version is needed by openexr_viewers
   openexr_ctl = import ../development/libraries/openexr_ctl {
     inherit fetchurl stdenv ilmbase ctl;