pyrox.dev / nixpkgs
lol
fork atom

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
unified split
+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 5 }: 6 stdenv.mkDerivation rec { 7 pname = "prusa-slicer"; 8 - version = "2.2.0"; 9 10 nativeBuildInputs = [ 11 cmake 12 pkg-config 13 ]; 14 15 buildInputs = [ ··· 17 cereal 18 cgal_5 19 curl 20 eigen 21 expat 22 glew 23 gmp 24 ilmbase 25 libpng 26 mpfr 27 nlopt 28 openvdb 29 systemd 30 tbb 31 - wxGTK31 32 xorg.libX11 33 ] ++ checkInputs; 34 35 checkInputs = [ gtest ]; 36 37 # The build system uses custom logic - defined in ··· 62 src = fetchFromGitHub { 63 owner = "prusa3d"; 64 repo = "PrusaSlicer"; 65 - sha256 = "0954k9sm09y8qnz1jyswyysg10k54ywz8mswnwa4n2hnpq9qx73m"; 66 rev = "version_${version}"; 67 }; 68 69 cmakeFlags = [ 70 "-DSLIC3R_FHS=1" 71 ]; 72 73 postInstall = '' 74 mkdir -p "$out/share/pixmaps/" 75 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/" 78 ''; 79 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 90 meta = with lib; { 91 description = "G-code generator for 3D printer";
··· 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 4 }: 5 stdenv.mkDerivation rec { 6 pname = "prusa-slicer"; 7 + version = "2.3.0"; 8 9 nativeBuildInputs = [ 10 cmake 11 + copyDesktopItems 12 pkg-config 13 + wrapGAppsHook 14 ]; 15 16 buildInputs = [ ··· 18 cereal 19 cgal_5 20 curl 21 + dbus 22 eigen 23 expat 24 glew 25 + glib 26 gmp 27 + gtk3 28 + hicolor-icon-theme 29 ilmbase 30 libpng 31 mpfr 32 nlopt 33 openvdb 34 + pcre 35 systemd 36 tbb 37 + wxGTK31-gtk3 38 xorg.libX11 39 ] ++ checkInputs; 40 41 + doCheck = true; 42 checkInputs = [ gtest ]; 43 44 # The build system uses custom logic - defined in ··· 69 src = fetchFromGitHub { 70 owner = "prusa3d"; 71 repo = "PrusaSlicer"; 72 + sha256 = "08zyvik8cyj1n9knbg8saan7j8s60nzkyj4a77818zbi9lpi65i5"; 73 rev = "version_${version}"; 74 }; 75 76 cmakeFlags = [ 77 "-DSLIC3R_FHS=1" 78 + "-DSLIC3R_GTK=3" 79 ]; 80 81 postInstall = '' 82 + ln -s "$out/bin/prusa-slicer" "$out/bin/prusa-gcodeviewer" 83 + 84 mkdir -p "$out/share/pixmaps/" 85 ln -s "$out/share/PrusaSlicer/icons/PrusaSlicer.png" "$out/share/pixmaps/PrusaSlicer.png" 86 + ln -s "$out/share/PrusaSlicer/icons/PrusaSlicer-gcodeviewer_192px.png" "$out/share/pixmaps/PrusaSlicer-gcodeviewer.png" 87 ''; 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 + ]; 109 110 meta = with lib; { 111 description = "G-code generator for 3D printer";
+11 -11
pkgs/applications/misc/prusa-slicer/super-slicer.nix
··· 24 postInstall = '' 25 mkdir -p "$out/share/pixmaps/" 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 ''; 30 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 - }; 40 41 meta = with lib; { 42 inherit description;
··· 24 postInstall = '' 25 mkdir -p "$out/share/pixmaps/" 26 ln -s "$out/share/SuperSlicer/icons/Slic3r.png" "$out/share/pixmaps/${appname}.png" 27 ''; 28 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 41 meta = with lib; { 42 inherit description;