Merge pull request #68248 from Moredread/slicer

prusa-slicer: 2.0.0 -> 2.1.0
This commit is contained in:
Florian Klink 2019-10-14 15:33:34 +02:00 committed by GitHub
commit 79676a26dc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 37 additions and 7 deletions

View file

@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper, cmake, pkgconfig
, boost, curl, expat, glew, libpng, tbb, wxGTK30
, boost, cereal, curl, eigen, expat, glew, libpng, tbb, wxGTK30
, gtest, nlopt, xorg, makeDesktopItem
}:
let
@ -9,7 +9,7 @@ let
in
stdenv.mkDerivation rec {
pname = "prusa-slicer";
version = "2.0.0";
version = "2.1.0";
enableParallelBuilding = true;
@ -19,11 +19,11 @@ stdenv.mkDerivation rec {
pkgconfig
];
# We could add Eigen, but it doesn't currently compile with the version in
# nixpkgs.
buildInputs = [
boost
cereal
curl
eigen
expat
glew
libpng
@ -40,10 +40,15 @@ stdenv.mkDerivation rec {
# We need to set the path via the NLOPT environment variable instead.
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 = ''
# In nix ioctls.h isn't available from the standard kernel-headers package
# on other distributions. As the copy in glibc seems to be identical to the
# one in the kernel, we use that one instead.
# like in other distributions. The copy in glibc seems to be identical to the
# one in the kernel though, so we use that one instead.
sed -i 's|"/usr/include/asm-generic/ioctls.h"|<asm-generic/ioctls.h>|g' src/libslic3r/GCodeSender.cpp
'' + lib.optionalString (lib.versionOlder "2.5" nloptVersion) ''
# Since version 2.5.0 of nlopt we need to link to libnlopt, as libnlopt_cxx
@ -54,7 +59,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "prusa3d";
repo = "PrusaSlicer";
sha256 = "135wn2sza2f2kvbja1haxil5kx1b74lc1i7dsa35i1y3phabykhz";
sha256 = "172nz01iiqfjzkpcbl78j6almq6av70l71jgrzrcdw6ham1wqnpr";
rev = "version_${version}";
};

View file

@ -0,0 +1,23 @@
{ stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
pname = "cereal";
version = "1.2.2";
nativeBuildInputs = [ cmake ];
src = fetchFromGitHub {
owner = "USCiLab";
repo = "cereal";
rev = "v${version}";
sha256 = "1ckr8r03ggg5pyzg8yw40d5ssq40h5najvyqlnxc85fxxp8rnrx4";
};
cmakeFlagsArray = [ "-DJUST_INSTALL_CEREAL=yes" ];
meta = with stdenv.lib; {
description = "A header-only C++11 serialization library";
homepage = https://uscilab.github.io/cereal/;
platforms = platforms.all;
license = licenses.mit;
};
}

View file

@ -153,6 +153,8 @@ in
castxml = callPackage ../development/tools/castxml { };
cereal = callPackage ../development/libraries/cereal { };
clj-kondo = callPackage ../development/tools/clj-kondo { };
cmark = callPackage ../development/libraries/cmark { };