dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

curaLulzbot: Adopt fixes from mainline cura package

Browse Source
This commit is contained in:
Charles Duffy 2019-09-25 23:13:19 -05:00
parent ff4e645739
commit de36bdc269
No known key found for this signature in database
GPG Key ID: BB397BA4CAA75978
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/applications/misc/cura/lulzbot/default.nix
View File

@ -1,4 +1,4 @@
{ lib, callPackage, fetchgit, cmake, jq, python3Packages, qtbase, qtquickcontrols2 }: { lib, mkDerivation, wrapQtAppsHook, callPackage, fetchgit, cmake, jq, python3, qtbase, qtquickcontrols2 }:
let let
# admittedly, we're using (printer firmware) blobs when we could compile them ourselves. # admittedly, we're using (printer firmware) blobs when we could compile them ourselves.
@ -10,23 +10,23 @@ let
}; };
libarcusLulzbot = callPackage ./libarcus.nix { libarcusLulzbot = callPackage ./libarcus.nix {
inherit (python3Packages) buildPythonPackage sip pythonOlder; inherit (python3.pkgs) buildPythonPackage sip pythonOlder;
}; };
libsavitarLulzbot = callPackage ./libsavitar.nix { libsavitarLulzbot = callPackage ./libsavitar.nix {
inherit (python3Packages) buildPythonPackage sip pythonOlder; inherit (python3.pkgs) buildPythonPackage sip pythonOlder;
}; };
inherit (python3Packages) buildPythonPackage pyqt5 numpy scipy shapely pythonOlder; inherit (python3.pkgs) buildPythonPackage pyqt5 numpy scipy shapely pythonOlder;
curaengine = callPackage ./curaengine.nix { curaengine = callPackage ./curaengine.nix {
inherit libarcusLulzbot; inherit libarcusLulzbot;
}; };
uraniumLulzbot = callPackage ./uranium.nix { uraniumLulzbot = callPackage ./uranium.nix {
inherit callPackage libarcusLulzbot; inherit callPackage libarcusLulzbot;
inherit (python3Packages) buildPythonPackage pyqt5 numpy scipy shapely pythonOlder; inherit (python3.pkgs) buildPythonPackage pyqt5 numpy scipy shapely pythonOlder;
}; };
in in
python3Packages.buildPythonApplication rec { mkDerivation rec {
name = "cura-lulzbot-${version}"; pname = "cura-lulzbot";
version = "3.6.20"; version = "3.6.20";
src = fetchgit { src = fetchgit {
@ -35,11 +35,10 @@ python3Packages.buildPythonApplication rec {
sha256 = "1xkqf89anxmy2aw0vr604ln7qsibacgk9l2g8jlf467hja8f0dzq"; sha256 = "1xkqf89anxmy2aw0vr604ln7qsibacgk9l2g8jlf467hja8f0dzq";
}; };
format = "other"; # using cmake to build
buildInputs = [ qtbase qtquickcontrols2 ]; buildInputs = [ qtbase qtquickcontrols2 ];
# numpy-stl temporarily disabled due to https://code.alephobjects.com/T8415 # numpy-stl temporarily disabled due to https://code.alephobjects.com/T8415
propagatedBuildInputs = with python3Packages; [ pyserial requests zeroconf ] ++ [ libsavitarLulzbot uraniumLulzbot libarcusLulzbot ]; # numpy-stl propagatedBuildInputs = with python3.pkgs; [ pyserial requests zeroconf ] ++ [ libsavitarLulzbot uraniumLulzbot libarcusLulzbot ]; # numpy-stl
nativeBuildInputs = [ cmake python3Packages.wrapPython ]; nativeBuildInputs = [ cmake python3.pkgs.wrapPython ];
cmakeFlags = [ cmakeFlags = [
"-DURANIUM_DIR=${uraniumLulzbot.src}" "-DURANIUM_DIR=${uraniumLulzbot.src}"
@ -68,6 +67,11 @@ python3Packages.buildPythonApplication rec {
EOF EOF
''; '';
postFixup = ''
wrapPythonPrograms
wrapQtApp "$out/bin/cura-lulzbot"
'';
meta = with lib; { meta = with lib; {
description = "3D printer / slicing GUI built on top of the Uranium framework"; description = "3D printer / slicing GUI built on top of the Uranium framework";
homepage = https://code.alephobjects.com/diffusion/CURA/; homepage = https://code.alephobjects.com/diffusion/CURA/;