mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-18 19:51:17 +00:00
Merge pull request #42082 from thorstenweber83/update-slic3r
slic3r-prusa3d: 1.39.2 -> 1.40.0
This commit is contained in:
commit
556f670c15
|
@ -1,6 +1,6 @@
|
|||
{ stdenv, fetchFromGitHub, makeWrapper, which, cmake, perl, perlPackages,
|
||||
boost, tbb, wxGTK30, pkgconfig, gtk3, fetchurl, gtk2, bash, libGLU,
|
||||
glew, eigen }:
|
||||
glew, eigen, curl }:
|
||||
let
|
||||
AlienWxWidgets = perlPackages.buildPerlPackage rec {
|
||||
name = "Alien-wxWidgets-0.69";
|
||||
|
@ -33,12 +33,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "slic3r-prusa-edition-${version}";
|
||||
version = "1.39.2";
|
||||
version = "1.40.0";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
buildInputs = [
|
||||
cmake
|
||||
curl
|
||||
perl
|
||||
makeWrapper
|
||||
eigen
|
||||
|
@ -73,6 +74,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
prePatch = ''
|
||||
sed -i 's|"/usr/include/asm-generic/ioctls.h"|<asm-generic/ioctls.h>|g' xs/src/libslic3r/GCodeSender.cpp
|
||||
sed -i "s|\''${PERL_VENDORARCH}|$out/lib/slic3r-prusa3d|g" xs/CMakeLists.txt
|
||||
sed -i "s|\''${PERL_VENDORLIB}|$out/lib/slic3r-prusa3d|g" xs/CMakeLists.txt
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
|
@ -82,14 +85,14 @@ stdenv.mkDerivation rec {
|
|||
|
||||
# it seems we need to copy the icons...
|
||||
mkdir -p $out/bin/var
|
||||
cp ../resources/icons/* $out/bin/var/
|
||||
cp -r ../resources/icons/* $out/bin/var/
|
||||
cp -r ../resources $out/bin/
|
||||
'';
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "prusa3d";
|
||||
repo = "Slic3r";
|
||||
sha256 = "0vbqkmd2yqi469ijqm4wyzjmq9w1kwiy8av1kchm4429z5hpmxcd";
|
||||
sha256 = "1cisplrfv6y9ijgl5bs46bxxmid5hl71hjzl73bay2i2bl8hid2f";
|
||||
rev = "version_${version}";
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue