From 26615e126069b8f11f3cfcb3bd081b908cc9c1af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= Date: Fri, 16 Feb 2018 22:24:21 +0100 Subject: [PATCH 1/2] slic3r-prusa3d: enable parallel building --- pkgs/applications/misc/slic3r-prusa3d/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/misc/slic3r-prusa3d/default.nix b/pkgs/applications/misc/slic3r-prusa3d/default.nix index ef8bfb1b2be..0fbafbfce43 100644 --- a/pkgs/applications/misc/slic3r-prusa3d/default.nix +++ b/pkgs/applications/misc/slic3r-prusa3d/default.nix @@ -34,6 +34,8 @@ stdenv.mkDerivation rec { name = "slic3r-prusa-edition-${version}"; version = "1.38.7"; + enableParallelBuilding = true; + buildInputs = [ cmake perl From 8d58c1e516a2c89da3e69d9a6d427215e4769d58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= Date: Fri, 16 Feb 2018 22:20:22 +0100 Subject: [PATCH 2/2] slic3r-prusa3d: use system version for eigen and glew If we don't provide eigen and glew, vendored versions are used. --- pkgs/applications/misc/slic3r-prusa3d/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/slic3r-prusa3d/default.nix b/pkgs/applications/misc/slic3r-prusa3d/default.nix index 0fbafbfce43..a4ac924cfae 100644 --- a/pkgs/applications/misc/slic3r-prusa3d/default.nix +++ b/pkgs/applications/misc/slic3r-prusa3d/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchFromGitHub, makeWrapper, which, cmake, perl, perlPackages, - boost, tbb, wxGTK30, pkgconfig, gtk3, fetchurl, gtk2, bash, mesa_glu }: + boost, tbb, wxGTK30, pkgconfig, gtk3, fetchurl, gtk2, bash, mesa_glu, + glew, eigen }: let AlienWxWidgets = perlPackages.buildPerlPackage rec { name = "Alien-wxWidgets-0.69"; @@ -40,6 +41,8 @@ stdenv.mkDerivation rec { cmake perl makeWrapper + eigen + glew tbb which Wx