public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

prusa-slicer: add Eigen as dependency 

Previously compilation failed when using our version of Eigen. Now it
works again.
This commit is contained in:
André-Patrick Bubel 2019-09-23 19:33:20 +02:00
parent 5c95ab00ce
commit dda8e47473
No known key found for this signature in database
GPG Key ID: 28925CBA8869FF29
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/misc/prusa-slicer/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper, cmake, pkgconfig { stdenv, lib, fetchFromGitHub, makeWrapper, cmake, pkgconfig
, boost, cereal, curl, expat, glew, libpng, tbb, wxGTK30 , boost, cereal, curl, eigen, expat, glew, libpng, tbb, wxGTK30
, gtest, nlopt, xorg, makeDesktopItem , gtest, nlopt, xorg, makeDesktopItem
}: }:
let let
@ -19,12 +19,11 @@ stdenv.mkDerivation rec {
pkgconfig pkgconfig
]; ];
# We could add Eigen, but it doesn't currently compile with the version in
# nixpkgs.
buildInputs = [ buildInputs = [
boost boost
cereal cereal
curl curl
eigen
expat expat
glew glew
libpng libpng
@ -41,6 +40,11 @@ stdenv.mkDerivation rec {
# We need to set the path via the NLOPT environment variable instead. # We need to set the path via the NLOPT environment variable instead.
NLOPT = nlopt; NLOPT = nlopt;
# Disable compiler warnings that clutter the build log
# It seems to be a known issue for Eigen:
# http://eigen.tuxfamily.org/bz/show_bug.cgi?id=1221
NIX_CFLAGS_COMPILE = "-Wno-ignored-attributes";
prePatch = '' prePatch = ''
# In nix ioctls.h isn't available from the standard kernel-headers package # In nix ioctls.h isn't available from the standard kernel-headers package
# like in other distributions. The copy in glibc seems to be identical to the # like in other distributions. The copy in glibc seems to be identical to the