From 08f0c4361c73d1a41049378c13cccaa6a94c4419 Mon Sep 17 00:00:00 2001 From: Johannes Frankenau Date: Tue, 15 May 2018 10:19:29 +0200 Subject: [PATCH 1/2] cura: fix invisible sidebar --- pkgs/applications/misc/cura/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix index edb10a0f667..ede69bbc116 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,7 @@ mkDerivation rec { sha256 = "0yaya0ww92qjm7g31q85m5f95nwdapldjx1kdf1ar4yzwh4r15rp"; }; - buildInputs = [ qtbase qtquickcontrols ]; + buildInputs = [ qtbase qtquickcontrols2 ]; propagatedBuildInputs = with python3.pkgs; [ uranium zeroconf pyserial numpy-stl ]; nativeBuildInputs = [ cmake python3.pkgs.wrapPython ]; From b9361e8da865450fdd31dd223fd44f74cac68dc2 Mon Sep 17 00:00:00 2001 From: Johannes Frankenau Date: Tue, 15 May 2018 10:48:56 +0200 Subject: [PATCH 2/2] cura: install missing materials --- pkgs/applications/misc/cura/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix index ede69bbc116..10f6837761b 100644 --- a/pkgs/applications/misc/cura/default.nix +++ b/pkgs/applications/misc/cura/default.nix @@ -11,6 +11,13 @@ mkDerivation rec { sha256 = "0yaya0ww92qjm7g31q85m5f95nwdapldjx1kdf1ar4yzwh4r15rp"; }; + 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 '';