diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-03-09 21:08:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-09 21:08:55 +0100 |
| commit | fa77fab07949554e17ec570f239798ccd4e5a1a6 (patch) | |
| tree | 7155ce3b1401e4d10169775cdb13f1d6fc52b329 | |
| parent | 7367cbd4e42b6513e6bc212ea7b32deeb0d5b76c (diff) | |
| parent | b325f74ce611c0d626abcd73987cda75e3fcf4c1 (diff) | |
| download | nixlib-fa77fab07949554e17ec570f239798ccd4e5a1a6.tar nixlib-fa77fab07949554e17ec570f239798ccd4e5a1a6.tar.gz nixlib-fa77fab07949554e17ec570f239798ccd4e5a1a6.tar.bz2 nixlib-fa77fab07949554e17ec570f239798ccd4e5a1a6.tar.lz nixlib-fa77fab07949554e17ec570f239798ccd4e5a1a6.tar.xz nixlib-fa77fab07949554e17ec570f239798ccd4e5a1a6.tar.zst nixlib-fa77fab07949554e17ec570f239798ccd4e5a1a6.zip | |
Merge pull request #294541 from atorres1985-contrib/freecad
freecad: refactor
| -rw-r--r-- | pkgs/by-name/fr/freecad/0001-NIXOS-don-t-ignore-PYTHONPATH.patch (renamed from pkgs/applications/graphics/freecad/0001-NIXOS-don-t-ignore-PYTHONPATH.patch) | 0 | ||||
| -rw-r--r-- | pkgs/by-name/fr/freecad/package.nix (renamed from pkgs/applications/graphics/freecad/default.nix) | 54 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 16 |
3 files changed, 30 insertions, 40 deletions
diff --git a/pkgs/applications/graphics/freecad/0001-NIXOS-don-t-ignore-PYTHONPATH.patch b/pkgs/by-name/fr/freecad/0001-NIXOS-don-t-ignore-PYTHONPATH.patch index 27e5fb81b8d0..27e5fb81b8d0 100644 --- a/pkgs/applications/graphics/freecad/0001-NIXOS-don-t-ignore-PYTHONPATH.patch +++ b/pkgs/by-name/fr/freecad/0001-NIXOS-don-t-ignore-PYTHONPATH.patch diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/by-name/fr/freecad/package.nix index 1ef114c9c496..436d94bd0f98 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/by-name/fr/freecad/package.nix @@ -1,14 +1,10 @@ { lib -, fmt -, stdenv -, fetchFromGitHub , cmake -, doxygen -, ninja -, gitpython -, boost , coin3d +, doxygen , eigen +, fetchFromGitHub +, fmt , freecad # for passthru.tests , gfortran , gts @@ -17,38 +13,48 @@ , libXmu , libf2c , libredwg +, libsForQt5 , libspnav -, matplotlib , medfile , mpi +, ninja , ode , opencascade-occt -, pivy , pkg-config -, ply -, pycollada -, pyside2 -, pyside2-tools -, python -, pyyaml -, qtbase -, qttools -, qtwebengine -, qtx11extras -, qtxmlpatterns +, python3Packages , runCommand # for passthru.tests -, scipy -, shiboken2 -, soqt , spaceNavSupport ? stdenv.isLinux +, stdenv , swig , vtk -, wrapQtAppsHook , wrapGAppsHook , xercesc , 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: { pname = "freecad"; version = "0.21.2"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 35324692d0a7..7951a6b94de3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31641,22 +31641,6 @@ with pkgs; fragments = callPackage ../applications/networking/p2p/fragments { }; - freecad = libsForQt5.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 { inherit (darwin.apple_sdk.frameworks) AppKit AVFoundation Cocoa CoreMedia; codec2 = codec2.override { |