From a13774ecfed6803ec2f4706463244c344f425396 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 23 Feb 2010 14:20:10 +0000 Subject: [PATCH] Making opencascade build its visualization, DRAW, and WOK libraries/tools. svn path=/nixpkgs/trunk/; revision=20193 --- pkgs/development/libraries/opencascade/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/opencascade/default.nix b/pkgs/development/libraries/opencascade/default.nix index 44e29fd7587f..ca792ed4c914 100644 --- a/pkgs/development/libraries/opencascade/default.nix +++ b/pkgs/development/libraries/opencascade/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, mesa, tcl, tk, file}: +{stdenv, fetchurl, mesa, tcl, tk, file, libXmu}: stdenv.mkDerivation rec { name = "opencascade-6.3.0"; @@ -7,12 +7,14 @@ stdenv.mkDerivation rec { md5 = "52778127974cb3141c2827f9d40d1f11"; }; - buildInputs = [ mesa tcl tk file ]; + buildInputs = [ mesa tcl tk file libXmu ]; preConfigure = '' cd ros ''; + configureFlags = [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" ]; + postInstall = '' mv $out/inc $out/include ensureDir $out/share/doc/${name} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 76e9abb6fd49..b4061af7211c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4623,6 +4623,7 @@ let opencascade = import ../development/libraries/opencascade { inherit fetchurl stdenv mesa tcl tk file; + inherit (xlibs) libXmu; }; openct = import ../development/libraries/openct {