MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 07:13:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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

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

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