Merge pull request #107187 from Moredread/prusa

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

View file

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

View file

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