diff options
| author | Matthew Justin Bauer <mjbauer95@gmail.com> | 2018-06-01 23:12:01 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-01 23:12:01 -0400 |
| commit | ed2177bb086b454f35582d9a978726a121d6172b (patch) | |
| tree | 07b8e74af9013e5295ef168660341d7d081084fa /pkgs/applications/misc | |
| parent | e3647d769b611b4950b495372e28db433eddd13a (diff) | |
| parent | b9361e8da865450fdd31dd223fd44f74cac68dc2 (diff) | |
| download | nixlib-ed2177bb086b454f35582d9a978726a121d6172b.tar nixlib-ed2177bb086b454f35582d9a978726a121d6172b.tar.gz nixlib-ed2177bb086b454f35582d9a978726a121d6172b.tar.bz2 nixlib-ed2177bb086b454f35582d9a978726a121d6172b.tar.lz nixlib-ed2177bb086b454f35582d9a978726a121d6172b.tar.xz nixlib-ed2177bb086b454f35582d9a978726a121d6172b.tar.zst nixlib-ed2177bb086b454f35582d9a978726a121d6172b.zip | |
Merge pull request #40544 from jfrankenau/cura-fix-sidebar-materials
cura: fix invisible sidebar and install missing materials
Diffstat (limited to 'pkgs/applications/misc')
| -rw-r--r-- | pkgs/applications/misc/cura/default.nix | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix index edb10a0f6671..10f6837761bb 100644 --- a/pkgs/applications/misc/cura/default.nix +++ b/pkgs/applications/misc/cura/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, python3, qtbase, qtquickcontrols, curaengine }: +{ mkDerivation, lib, fetchFromGitHub, cmake, python3, qtbase, qtquickcontrols2, curaengine }: mkDerivation rec { name = "cura-${version}"; @@ -11,7 +11,14 @@ mkDerivation rec { sha256 = "0yaya0ww92qjm7g31q85m5f95nwdapldjx1kdf1ar4yzwh4r15rp"; }; - buildInputs = [ qtbase qtquickcontrols ]; + materials = fetchFromGitHub { + owner = "Ultimaker"; + repo = "fdm_materials"; + rev = "3.2.1"; + sha256 = "1kr9ga727x0kazw2ypac9bi6g6lddbsx80qw8fbn0514kg2mr9n3"; + }; + + buildInputs = [ qtbase qtquickcontrols2 ]; propagatedBuildInputs = with python3.pkgs; [ uranium zeroconf pyserial numpy-stl ]; nativeBuildInputs = [ cmake python3.pkgs.wrapPython ]; @@ -22,6 +29,11 @@ mkDerivation rec { sed -i 's, executable_name = .*, executable_name = "${curaengine}/bin/CuraEngine",' plugins/CuraEngineBackend/CuraEngineBackend.py ''; + postInstall = '' + mkdir -p $out/share/cura/resources/materials + cp ${materials}/*.fdm_material $out/share/cura/resources/materials/ + ''; + postFixup = '' wrapPythonPrograms ''; |