From 4353a1a8738b892aec3783456d103f36f76cb004 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 14 Dec 2013 11:35:43 +0100 Subject: [PATCH] freecad: add matplotlib and pycollada dependencies When FreeCAD is started it prints that it's missing matplotlib and pycollada: $ FreeCAD [...] matplotlib not found, Plot module will be disabled pycollada not found, collada support will be disabled. The closure size of freecad is currently at 1.9 GiB. Adding these two deps increase it to 2.0 GiB. Reflow the expression function argument list. --- pkgs/applications/graphics/freecad/default.nix | 10 ++++++---- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index 340c9d0a69e9..37265c954e83 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -1,6 +1,6 @@ -{ fetchurl, stdenv, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts, -boost, zlib, -python, swig, gfortran, soqt, libf2c, pyqt4, makeWrapper }: +{ stdenv, fetchurl, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts +, boost, zlib, python, swig, gfortran, soqt, libf2c , pyqt4, makeWrapper +, matplotlib, pycollada }: stdenv.mkDerivation rec { name = "freecad-${version}"; @@ -12,7 +12,9 @@ stdenv.mkDerivation rec { }; buildInputs = [ cmake coin3d xercesc ode eigen qt4 opencascade gts boost - zlib python swig gfortran soqt libf2c pyqt4 makeWrapper ]; + zlib python swig gfortran soqt libf2c pyqt4 makeWrapper matplotlib + pycollada + ]; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 560820676565..916cc21564a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7984,6 +7984,7 @@ let freecad = callPackage ../applications/graphics/freecad { opencascade = opencascade_6_5; + inherit (pythonPackages) matplotlib pycollada; }; freemind = callPackage ../applications/misc/freemind {