ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-25 20:34:52 +03:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Lluís Batlle i Rossell 2010-01-16 21:26:10 +00:00
parent 30477123ef
commit 20e75e0cf0
3 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/build-support/gcc-wrapper/gcc-wrapper.sh
View File

@ -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

20
pkgs/development/libraries/opencv/default.nix Normal file
View File

@ -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";
};
}

7
pkgs/top-level/all-packages.nix
View File

@ -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;