freecad: prepare migration to by-name
- change libsForQt5.callPackage to callPackage - bring the libsForQt5 and python3Packages into the scope of expression
This commit is contained in:
parent
0db3bc9e5c
commit
f88b0e47f0
@ -1,14 +1,10 @@
|
|||||||
{ lib
|
{ lib
|
||||||
, fmt
|
|
||||||
, stdenv
|
|
||||||
, fetchFromGitHub
|
|
||||||
, cmake
|
, cmake
|
||||||
, doxygen
|
|
||||||
, ninja
|
|
||||||
, gitpython
|
|
||||||
, boost
|
|
||||||
, coin3d
|
, coin3d
|
||||||
|
, doxygen
|
||||||
, eigen
|
, eigen
|
||||||
|
, fetchFromGitHub
|
||||||
|
, fmt
|
||||||
, freecad # for passthru.tests
|
, freecad # for passthru.tests
|
||||||
, gfortran
|
, gfortran
|
||||||
, gts
|
, gts
|
||||||
@ -17,38 +13,48 @@
|
|||||||
, libXmu
|
, libXmu
|
||||||
, libf2c
|
, libf2c
|
||||||
, libredwg
|
, libredwg
|
||||||
|
, libsForQt5
|
||||||
, libspnav
|
, libspnav
|
||||||
, matplotlib
|
|
||||||
, medfile
|
, medfile
|
||||||
, mpi
|
, mpi
|
||||||
|
, ninja
|
||||||
, ode
|
, ode
|
||||||
, opencascade-occt
|
, opencascade-occt
|
||||||
, pivy
|
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, ply
|
, python3Packages
|
||||||
, pycollada
|
|
||||||
, pyside2
|
|
||||||
, pyside2-tools
|
|
||||||
, python
|
|
||||||
, pyyaml
|
|
||||||
, qtbase
|
|
||||||
, qttools
|
|
||||||
, qtwebengine
|
|
||||||
, qtx11extras
|
|
||||||
, qtxmlpatterns
|
|
||||||
, runCommand # for passthru.tests
|
, runCommand # for passthru.tests
|
||||||
, scipy
|
|
||||||
, shiboken2
|
|
||||||
, soqt
|
|
||||||
, spaceNavSupport ? stdenv.isLinux
|
, spaceNavSupport ? stdenv.isLinux
|
||||||
|
, stdenv
|
||||||
, swig
|
, swig
|
||||||
, vtk
|
, vtk
|
||||||
, wrapQtAppsHook
|
|
||||||
, wrapGAppsHook
|
, wrapGAppsHook
|
||||||
, xercesc
|
, xercesc
|
||||||
, zlib
|
, zlib
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
let
|
||||||
|
boost = python3Packages.boost;
|
||||||
|
inherit (libsForQt5)
|
||||||
|
qtbase
|
||||||
|
qttools
|
||||||
|
qtwebengine
|
||||||
|
qtx11extras
|
||||||
|
qtxmlpatterns
|
||||||
|
soqt
|
||||||
|
wrapQtAppsHook;
|
||||||
|
inherit (python3Packages)
|
||||||
|
gitpython
|
||||||
|
matplotlib
|
||||||
|
pivy
|
||||||
|
ply
|
||||||
|
pycollada
|
||||||
|
pyside2
|
||||||
|
pyside2-tools
|
||||||
|
python
|
||||||
|
pyyaml
|
||||||
|
scipy
|
||||||
|
shiboken2;
|
||||||
|
in
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "freecad";
|
pname = "freecad";
|
||||||
version = "0.21.2";
|
version = "0.21.2";
|
||||||
|
@ -31641,21 +31641,7 @@ with pkgs;
|
|||||||
|
|
||||||
fragments = callPackage ../applications/networking/p2p/fragments { };
|
fragments = callPackage ../applications/networking/p2p/fragments { };
|
||||||
|
|
||||||
freecad = libsForQt5.callPackage ../applications/graphics/freecad {
|
freecad = callPackage ../applications/graphics/freecad { };
|
||||||
boost = python3Packages.boost;
|
|
||||||
inherit (python3Packages)
|
|
||||||
gitpython
|
|
||||||
matplotlib
|
|
||||||
pivy
|
|
||||||
ply
|
|
||||||
pycollada
|
|
||||||
pyside2
|
|
||||||
pyside2-tools
|
|
||||||
python
|
|
||||||
pyyaml
|
|
||||||
scipy
|
|
||||||
shiboken2;
|
|
||||||
};
|
|
||||||
|
|
||||||
freedv = callPackage ../applications/radio/freedv {
|
freedv = callPackage ../applications/radio/freedv {
|
||||||
inherit (darwin.apple_sdk.frameworks) AppKit AVFoundation Cocoa CoreMedia;
|
inherit (darwin.apple_sdk.frameworks) AppKit AVFoundation Cocoa CoreMedia;
|
||||||
|
Loading…
Reference in New Issue
Block a user