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

prusa-slicer: 2.0.0 -> 2.1.0

Browse Source
This commit is contained in:
André-Patrick Bubel 2019-09-23 19:33:04 +02:00
parent f2fd1381c5
commit 5c95ab00ce
No known key found for this signature in database
GPG Key ID: 28925CBA8869FF29
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
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, curl, expat, glew, libpng, tbb, wxGTK30 , boost, cereal, curl, expat, glew, libpng, tbb, wxGTK30
, gtest, nlopt, xorg, makeDesktopItem , gtest, nlopt, xorg, makeDesktopItem
}: }:
let let
@ -9,7 +9,7 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "prusa-slicer"; pname = "prusa-slicer";
version = "2.0.0"; version = "2.1.0";
enableParallelBuilding = true; enableParallelBuilding = true;
@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
# nixpkgs. # nixpkgs.
buildInputs = [ buildInputs = [
boost boost
cereal
curl curl
expat expat
glew glew
@ -42,8 +43,8 @@ stdenv.mkDerivation rec {
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
# on other distributions. As 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, 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) '' '' + 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
@ -54,7 +55,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "prusa3d"; owner = "prusa3d";
repo = "PrusaSlicer"; repo = "PrusaSlicer";
sha256 = "135wn2sza2f2kvbja1haxil5kx1b74lc1i7dsa35i1y3phabykhz"; sha256 = "172nz01iiqfjzkpcbl78j6almq6av70l71jgrzrcdw6ham1wqnpr";
rev = "version_${version}"; rev = "version_${version}";
}; };