alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #82551 from Moredread/slicer

Browse source 
prusa-slicer: 2.1.1 -> 2.2.0
This commit is contained in:
Jörg Thalheim 2020-03-31 14:54:45 +01:00 committed by GitHub
parent 3d6b05766c bbce57b143
commit 84ad3f2dc2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
pkgs/applications/misc/prusa-slicer/default.nix
View file

@ -1,32 +1,34 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper, cmake, pkgconfig { stdenv, lib, fetchFromGitHub, cmake, pkgconfig
, boost, cereal, curl, eigen, expat, glew, libpng, tbb, wxGTK31 , boost, cereal, curl, eigen, expat, glew, libpng, tbb, wxGTK31
, gtest, nlopt, xorg, makeDesktopItem , gtest, nlopt, xorg, makeDesktopItem
, cgal_5, gmp, ilmbase, mpfr, qhull, openvdb, systemd
}: }:
let
nloptVersion = if lib.hasAttr "version" nlopt
then lib.getAttr "version" nlopt
else "2.4";
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "prusa-slicer"; pname = "prusa-slicer";
version = "2.1.1"; version = "2.2.0";
enableParallelBuilding = true; enableParallelBuilding = true;
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
makeWrapper
pkgconfig pkgconfig
]; ];
buildInputs = [ buildInputs = [
boost boost
cereal cereal
cgal_5
curl curl
eigen eigen
expat expat
glew glew
gmp
ilmbase
libpng libpng
mpfr
nlopt
openvdb
systemd
tbb tbb
wxGTK31 wxGTK31
xorg.libX11 xorg.libX11
@ -35,31 +37,34 @@ stdenv.mkDerivation rec {
checkInputs = [ gtest ]; checkInputs = [ gtest ];
# The build system uses custom logic - defined in # The build system uses custom logic - defined in
# xs/src/libnest2d/cmake_modules/FindNLopt.cmake in the package source - # cmake/modules/FindNLopt.cmake in the package source - for finding the nlopt
# for finding the nlopt library, which doesn't pick up the package in the nix store. # library, which doesn't pick up the package in the nix store. We
# We need to set the path via the NLOPT environment variable instead. # additionally need to set the path via the NLOPT environment variable.
NLOPT = nlopt; NLOPT = nlopt;
# Disable compiler warnings that clutter the build log # Disable compiler warnings that clutter the build log.
# It seems to be a known issue for Eigen: # It seems to be a known issue for Eigen:
# http://eigen.tuxfamily.org/bz/show_bug.cgi?id=1221 # http://eigen.tuxfamily.org/bz/show_bug.cgi?id=1221
NIX_CFLAGS_COMPILE = "-Wno-ignored-attributes"; NIX_CFLAGS_COMPILE = "-Wno-ignored-attributes";
# prusa-slicer uses dlopen on `libudev.so` at runtime
NIX_LDFLAGS = "-ludev";
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
# one in the kernel though, so we use that one instead. # 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 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 # Since version 2.5.0 of nlopt we need to link to libnlopt, as libnlopt_cxx
# now seems to be integrated into the main lib. # now seems to be integrated into the main lib.
sed -i 's|nlopt_cxx|nlopt|g' src/libnest2d/cmake_modules/FindNLopt.cmake sed -i 's|nlopt_cxx|nlopt|g' cmake/modules/FindNLopt.cmake
''; '';
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "prusa3d"; owner = "prusa3d";
repo = "PrusaSlicer"; repo = "PrusaSlicer";
sha256 = "0i393nbc2salb4j5l2hvy03ng7hmf90d2xj653pw9bsikhj0r3jd"; sha256 = "0954k9sm09y8qnz1jyswyysg10k54ywz8mswnwa4n2hnpq9qx73m";
rev = "version_${version}"; rev = "version_${version}";
}; };
@ -88,6 +93,6 @@ stdenv.mkDerivation rec {
description = "G-code generator for 3D printer"; description = "G-code generator for 3D printer";
homepage = https://github.com/prusa3d/PrusaSlicer; homepage = https://github.com/prusa3d/PrusaSlicer;
license = licenses.agpl3; license = licenses.agpl3;
maintainers = with maintainers; [ tweber ]; maintainers = with maintainers; [ moredread tweber ];
}; };
} }