cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #107187 from Moredread/prusa

Browse source 
prusa-slicer: 2.2.0 -> 2.3.0
This commit is contained in:
Martin Weinelt 2021-01-18 15:23:12 +01:00 committed by GitHub
commit deac117ee4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 49 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,15 +1,16 @@
{ stdenv, lib, fetchFromGitHub, cmake, pkg-config
, boost, cereal, curl, eigen, expat, glew, libpng, tbb, wxGTK31
, gtest, nlopt, xorg, makeDesktopItem
, cgal_5, gmp, ilmbase, mpfr, qhull, openvdb, systemd
{ stdenv, lib, fetchFromGitHub, cmake, copyDesktopItems, makeDesktopItem, pkg-config, wrapGAppsHook
, boost, cereal, cgal_5, curl, dbus, eigen, expat, glew, glib, gmp, gtest, gtk3, hicolor-icon-theme
, ilmbase, libpng, mpfr, nlopt, openvdb, pcre, qhull, systemd, tbb, wxGTK31-gtk3, xorg
}:
stdenv.mkDerivation rec {
pname = "prusa-slicer";
version = "2.2.0";
version = "2.3.0";
nativeBuildInputs = [
cmake
copyDesktopItems
pkg-config
wrapGAppsHook
];
buildInputs = [
@ -17,21 +18,27 @@ stdenv.mkDerivation rec {
cereal
cgal_5
curl
dbus
eigen
expat
glew
glib
gmp
gtk3
hicolor-icon-theme
ilmbase
libpng
mpfr
nlopt
openvdb
pcre
systemd
tbb
wxGTK31
wxGTK31-gtk3
xorg.libX11
] ++ checkInputs;
doCheck = true;
checkInputs = [ gtest ];
# The build system uses custom logic - defined in
@ -62,30 +69,43 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "prusa3d";
repo = "PrusaSlicer";
sha256 = "0954k9sm09y8qnz1jyswyysg10k54ywz8mswnwa4n2hnpq9qx73m";
sha256 = "08zyvik8cyj1n9knbg8saan7j8s60nzkyj4a77818zbi9lpi65i5";
rev = "version_${version}";
};
cmakeFlags = [
"-DSLIC3R_FHS=1"
"-DSLIC3R_GTK=3"
];
postInstall = ''
ln -s "$out/bin/prusa-slicer" "$out/bin/prusa-gcodeviewer"
mkdir -p "$out/share/pixmaps/"
ln -s "$out/share/PrusaSlicer/icons/PrusaSlicer.png" "$out/share/pixmaps/PrusaSlicer.png"
mkdir -p "$out/share/applications"
cp "$desktopItem"/share/applications/* "$out/share/applications/"
ln -s "$out/share/PrusaSlicer/icons/PrusaSlicer-gcodeviewer_192px.png" "$out/share/pixmaps/PrusaSlicer-gcodeviewer.png"
'';
desktopItem = makeDesktopItem {
name = "PrusaSlicer";
exec = "prusa-slicer";
icon = "PrusaSlicer";
comment = "G-code generator for 3D printers";
desktopName = "PrusaSlicer";
genericName = "3D printer tool";
categories = "Development;";
};
desktopItems = [
(makeDesktopItem {
name = "PrusaSlicer";
exec = "prusa-slicer";
icon = "PrusaSlicer";
comment = "G-code generator for 3D printers";
desktopName = "PrusaSlicer";
genericName = "3D printer tool";
categories = "Development;";
})
(makeDesktopItem {
name = "PrusaSlicer G-code Viewer";
exec = "prusa-gcodeviewer";
icon = "PrusaSlicer-gcodeviewer";
comment = "G-code viewer for 3D printers";
desktopName = "PrusaSlicer G-code Viewer";
genericName = "G-code Viewer";
categories = "Development;";
})
];
meta = with lib; {
description = "G-code generator for 3D printer";

22
pkgs/applications/misc/prusa-slicer/super-slicer.nix
View file

@ -24,19 +24,19 @@ let
postInstall = ''
mkdir -p "$out/share/pixmaps/"
ln -s "$out/share/SuperSlicer/icons/Slic3r.png" "$out/share/pixmaps/${appname}.png"
mkdir -p "$out/share/applications"
cp "$desktopItem"/share/applications/* "$out/share/applications/"
'';
desktopItem = makeDesktopItem {
name = appname;
exec = "superslicer";
icon = appname;
comment = description;
desktopName = appname;
genericName = "3D printer tool";
categories = "Development;";
};
desktopItems = [
(makeDesktopItem {
name = appname;
exec = "superslicer";
icon = appname;
comment = description;
desktopName = appname;
genericName = "3D printer tool";
categories = "Development;";
})
];
meta = with lib; {
inherit description;