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

Merge pull request #42082 from thorstenweber83/update-slic3r

Browse Source 
slic3r-prusa3d: 1.39.2 -> 1.40.0
This commit is contained in:
Jörg Thalheim 2018-06-16 08:55:58 +01:00 committed by GitHub
commit 556f670c15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/applications/misc/slic3r/prusa3d.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, makeWrapper, which, cmake, perl, perlPackages, { stdenv, fetchFromGitHub, makeWrapper, which, cmake, perl, perlPackages,
boost, tbb, wxGTK30, pkgconfig, gtk3, fetchurl, gtk2, bash, libGLU, boost, tbb, wxGTK30, pkgconfig, gtk3, fetchurl, gtk2, bash, libGLU,
glew, eigen }: glew, eigen, curl }:
let let
AlienWxWidgets = perlPackages.buildPerlPackage rec { AlienWxWidgets = perlPackages.buildPerlPackage rec {
name = "Alien-wxWidgets-0.69"; name = "Alien-wxWidgets-0.69";
@ -33,12 +33,13 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "slic3r-prusa-edition-${version}"; name = "slic3r-prusa-edition-${version}";
version = "1.39.2"; version = "1.40.0";
enableParallelBuilding = true; enableParallelBuilding = true;
buildInputs = [ buildInputs = [
cmake cmake
curl
perl perl
makeWrapper makeWrapper
eigen eigen
@ -73,6 +74,8 @@ stdenv.mkDerivation rec {
prePatch = '' prePatch = ''
sed -i 's|"/usr/include/asm-generic/ioctls.h"|<asm-generic/ioctls.h>|g' xs/src/libslic3r/GCodeSender.cpp 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 = '' postInstall = ''
@ -82,14 +85,14 @@ stdenv.mkDerivation rec {
# it seems we need to copy the icons... # it seems we need to copy the icons...
mkdir -p $out/bin/var mkdir -p $out/bin/var
cp ../resources/icons/* $out/bin/var/ cp -r ../resources/icons/* $out/bin/var/
cp -r ../resources $out/bin/ cp -r ../resources $out/bin/
''; '';
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "prusa3d"; owner = "prusa3d";
repo = "Slic3r"; repo = "Slic3r";
sha256 = "0vbqkmd2yqi469ijqm4wyzjmq9w1kwiy8av1kchm4429z5hpmxcd"; sha256 = "1cisplrfv6y9ijgl5bs46bxxmid5hl71hjzl73bay2i2bl8hid2f";
rev = "version_${version}"; rev = "version_${version}";
}; };