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

freecad: do not use top-level Python packages

Browse Source
This commit is contained in:
Frederik Rietdijk 2016-09-25 22:32:09 +02:00
parent 7ff1544981
commit 7470f4d761
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/graphics/freecad/default.nix
View File

@ -1,8 +1,9 @@
{ stdenv, fetchurl, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts
, boost, zlib, python, swig, gfortran, soqt, libf2c, makeWrapper
, matplotlib, pycollada, pyside, pysideTools, pysideShiboken, pivy }:
, boost, zlib, python27Packages, swig, gfortran, soqt, libf2c, makeWrapper }:
stdenv.mkDerivation rec {
let
pythonPackages = python27Packages;
in stdenv.mkDerivation rec {
name = "freecad-${version}";
version = "0.16";
@ -11,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "02cfw5wlb04j0ymhk4skrm7rvbz13hpv995asf9v8q6wn2s1mivc";
};
buildInputs = [ cmake coin3d xercesc ode eigen qt4 opencascade gts boost
buildInputs = with pythonPackages; [ cmake coin3d xercesc ode eigen qt4 opencascade gts boost
zlib python swig gfortran soqt libf2c makeWrapper matplotlib
pycollada pyside pysideShiboken pysideTools pivy
];

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

@ -13469,7 +13469,6 @@ in
freecad = callPackage ../applications/graphics/freecad {
boost = boost155;
opencascade = opencascade_oce;
inherit (pythonPackages) matplotlib pycollada pivy;
};
freemind = callPackage ../applications/misc/freemind { };