Merge pull request #107187 from Moredread/prusa

prusa-slicer: 2.2.0 -> 2.3.0

authored by

Martin Weinelt and committed by
GitHub
deac117e 6867c3b3

+49 -29
+38 -18
pkgs/applications/misc/prusa-slicer/default.nix
··· 1 - { stdenv, lib, fetchFromGitHub, cmake, pkg-config 2 - , boost, cereal, curl, eigen, expat, glew, libpng, tbb, wxGTK31 3 - , gtest, nlopt, xorg, makeDesktopItem 4 - , cgal_5, gmp, ilmbase, mpfr, qhull, openvdb, systemd 1 + { stdenv, lib, fetchFromGitHub, cmake, copyDesktopItems, makeDesktopItem, pkg-config, wrapGAppsHook 2 + , boost, cereal, cgal_5, curl, dbus, eigen, expat, glew, glib, gmp, gtest, gtk3, hicolor-icon-theme 3 + , ilmbase, libpng, mpfr, nlopt, openvdb, pcre, qhull, systemd, tbb, wxGTK31-gtk3, xorg 5 4 }: 6 5 stdenv.mkDerivation rec { 7 6 pname = "prusa-slicer"; 8 - version = "2.2.0"; 7 + version = "2.3.0"; 9 8 10 9 nativeBuildInputs = [ 11 10 cmake 11 + copyDesktopItems 12 12 pkg-config 13 + wrapGAppsHook 13 14 ]; 14 15 15 16 buildInputs = [ ··· 17 18 cereal 18 19 cgal_5 19 20 curl 21 + dbus 20 22 eigen 21 23 expat 22 24 glew 25 + glib 23 26 gmp 27 + gtk3 28 + hicolor-icon-theme 24 29 ilmbase 25 30 libpng 26 31 mpfr 27 32 nlopt 28 33 openvdb 34 + pcre 29 35 systemd 30 36 tbb 31 - wxGTK31 37 + wxGTK31-gtk3 32 38 xorg.libX11 33 39 ] ++ checkInputs; 34 40 41 + doCheck = true; 35 42 checkInputs = [ gtest ]; 36 43 37 44 # The build system uses custom logic - defined in ··· 62 69 src = fetchFromGitHub { 63 70 owner = "prusa3d"; 64 71 repo = "PrusaSlicer"; 65 - sha256 = "0954k9sm09y8qnz1jyswyysg10k54ywz8mswnwa4n2hnpq9qx73m"; 72 + sha256 = "08zyvik8cyj1n9knbg8saan7j8s60nzkyj4a77818zbi9lpi65i5"; 66 73 rev = "version_${version}"; 67 74 }; 68 75 69 76 cmakeFlags = [ 70 77 "-DSLIC3R_FHS=1" 78 + "-DSLIC3R_GTK=3" 71 79 ]; 72 80 73 81 postInstall = '' 82 + ln -s "$out/bin/prusa-slicer" "$out/bin/prusa-gcodeviewer" 83 + 74 84 mkdir -p "$out/share/pixmaps/" 75 85 ln -s "$out/share/PrusaSlicer/icons/PrusaSlicer.png" "$out/share/pixmaps/PrusaSlicer.png" 76 - mkdir -p "$out/share/applications" 77 - cp "$desktopItem"/share/applications/* "$out/share/applications/" 86 + ln -s "$out/share/PrusaSlicer/icons/PrusaSlicer-gcodeviewer_192px.png" "$out/share/pixmaps/PrusaSlicer-gcodeviewer.png" 78 87 ''; 79 88 80 - desktopItem = makeDesktopItem { 81 - name = "PrusaSlicer"; 82 - exec = "prusa-slicer"; 83 - icon = "PrusaSlicer"; 84 - comment = "G-code generator for 3D printers"; 85 - desktopName = "PrusaSlicer"; 86 - genericName = "3D printer tool"; 87 - categories = "Development;"; 88 - }; 89 + desktopItems = [ 90 + (makeDesktopItem { 91 + name = "PrusaSlicer"; 92 + exec = "prusa-slicer"; 93 + icon = "PrusaSlicer"; 94 + comment = "G-code generator for 3D printers"; 95 + desktopName = "PrusaSlicer"; 96 + genericName = "3D printer tool"; 97 + categories = "Development;"; 98 + }) 99 + (makeDesktopItem { 100 + name = "PrusaSlicer G-code Viewer"; 101 + exec = "prusa-gcodeviewer"; 102 + icon = "PrusaSlicer-gcodeviewer"; 103 + comment = "G-code viewer for 3D printers"; 104 + desktopName = "PrusaSlicer G-code Viewer"; 105 + genericName = "G-code Viewer"; 106 + categories = "Development;"; 107 + }) 108 + ]; 89 109 90 110 meta = with lib; { 91 111 description = "G-code generator for 3D printer";
+11 -11
pkgs/applications/misc/prusa-slicer/super-slicer.nix
··· 24 24 postInstall = '' 25 25 mkdir -p "$out/share/pixmaps/" 26 26 ln -s "$out/share/SuperSlicer/icons/Slic3r.png" "$out/share/pixmaps/${appname}.png" 27 - mkdir -p "$out/share/applications" 28 - cp "$desktopItem"/share/applications/* "$out/share/applications/" 29 27 ''; 30 28 31 - desktopItem = makeDesktopItem { 32 - name = appname; 33 - exec = "superslicer"; 34 - icon = appname; 35 - comment = description; 36 - desktopName = appname; 37 - genericName = "3D printer tool"; 38 - categories = "Development;"; 39 - }; 29 + desktopItems = [ 30 + (makeDesktopItem { 31 + name = appname; 32 + exec = "superslicer"; 33 + icon = appname; 34 + comment = description; 35 + desktopName = appname; 36 + genericName = "3D printer tool"; 37 + categories = "Development;"; 38 + }) 39 + ]; 40 40 41 41 meta = with lib; { 42 42 inherit description;