Making opencascade link properly its shared objects with their dependencies. Its libtool script

used 'file' to find the shared object needed on linking.

svn path=/nixpkgs/trunk/; revision=20112
This commit is contained in:
Lluís Batlle i Rossell 2010-02-18 16:24:45 +00:00
parent bf4f2769b1
commit cdf6235ac9
2 changed files with 3 additions and 4 deletions

View file

@ -1,4 +1,4 @@
{stdenv, fetchurl, mesa, qt4, tcl, tk}: {stdenv, fetchurl, mesa, qt4, tcl, tk, file}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "opencascade-6.3.0"; name = "opencascade-6.3.0";
@ -7,10 +7,9 @@ stdenv.mkDerivation rec {
md5 = "52778127974cb3141c2827f9d40d1f11"; md5 = "52778127974cb3141c2827f9d40d1f11";
}; };
buildInputs = [ mesa qt4 tcl tk]; buildInputs = [ mesa qt4 tcl tk file ];
preConfigure = '' preConfigure = ''
export LDFLAGS=-L$out/lib
cd ros cd ros
''; '';

View file

@ -4620,7 +4620,7 @@ let
}; };
opencascade = import ../development/libraries/opencascade { opencascade = import ../development/libraries/opencascade {
inherit fetchurl stdenv mesa qt4 tcl tk; inherit fetchurl stdenv mesa qt4 tcl tk file;
}; };
openct = import ../development/libraries/openct { openct = import ../development/libraries/openct {