Merge pull request #35058 from Moredread/slic3r-prusa-edition/deps
slic3r-prusa3d: use system version for eigen and glew
This commit is contained in:
commit
b9214eec11
@ -1,5 +1,6 @@
|
|||||||
{ stdenv, fetchFromGitHub, makeWrapper, which, cmake, perl, perlPackages,
|
{ 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
|
let
|
||||||
AlienWxWidgets = perlPackages.buildPerlPackage rec {
|
AlienWxWidgets = perlPackages.buildPerlPackage rec {
|
||||||
name = "Alien-wxWidgets-0.69";
|
name = "Alien-wxWidgets-0.69";
|
||||||
@ -34,10 +35,14 @@ stdenv.mkDerivation rec {
|
|||||||
name = "slic3r-prusa-edition-${version}";
|
name = "slic3r-prusa-edition-${version}";
|
||||||
version = "1.38.7";
|
version = "1.38.7";
|
||||||
|
|
||||||
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
cmake
|
cmake
|
||||||
perl
|
perl
|
||||||
makeWrapper
|
makeWrapper
|
||||||
|
eigen
|
||||||
|
glew
|
||||||
tbb
|
tbb
|
||||||
which
|
which
|
||||||
Wx
|
Wx
|
||||||
|
Loading…
x
Reference in New Issue
Block a user