From cdf6235ac9cab81643dcc9d9b58d62c679d669f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 18 Feb 2010 16:24:45 +0000 Subject: [PATCH] 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 --- pkgs/development/libraries/opencascade/default.nix | 5 ++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/opencascade/default.nix b/pkgs/development/libraries/opencascade/default.nix index 56c97f7686e..ed0d48800ef 100644 --- a/pkgs/development/libraries/opencascade/default.nix +++ b/pkgs/development/libraries/opencascade/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, mesa, qt4, tcl, tk}: +{stdenv, fetchurl, mesa, qt4, tcl, tk, file}: stdenv.mkDerivation rec { name = "opencascade-6.3.0"; @@ -7,10 +7,9 @@ stdenv.mkDerivation rec { md5 = "52778127974cb3141c2827f9d40d1f11"; }; - buildInputs = [ mesa qt4 tcl tk]; + buildInputs = [ mesa qt4 tcl tk file ]; preConfigure = '' - export LDFLAGS=-L$out/lib cd ros ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab6a5c63f33..8c129538d58 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4620,7 +4620,7 @@ let }; 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 {