Merge pull request #188037 from 06kellyjac/prusa-desktop

prusa-slicer: remove duplcate desktop items
This commit is contained in:
Bernardo Meurer 2022-08-25 10:19:26 -03:00 committed by GitHub
commit 9ad9531df6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -3,8 +3,6 @@
, binutils , binutils
, fetchFromGitHub , fetchFromGitHub
, cmake , cmake
, copyDesktopItems
, makeDesktopItem
, pkg-config , pkg-config
, wrapGAppsHook , wrapGAppsHook
, boost , boost
@ -54,7 +52,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
copyDesktopItems
pkg-config pkg-config
wrapGAppsHook wrapGAppsHook
]; ];
@ -153,27 +150,6 @@ stdenv.mkDerivation rec {
ln -s "$out/share/PrusaSlicer/icons/PrusaSlicer-gcodeviewer_192px.png" "$out/share/pixmaps/PrusaSlicer-gcodeviewer.png" ln -s "$out/share/PrusaSlicer/icons/PrusaSlicer-gcodeviewer_192px.png" "$out/share/pixmaps/PrusaSlicer-gcodeviewer.png"
''; '';
desktopItems = [
(makeDesktopItem {
name = "prusa-slicer";
exec = "prusa-slicer";
icon = "PrusaSlicer";
comment = "G-code generator for 3D printers";
desktopName = "PrusaSlicer";
genericName = "3D printer tool";
categories = [ "Development" ];
})
(makeDesktopItem {
name = "prusa-gcodeviewer";
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";
homepage = "https://github.com/prusa3d/PrusaSlicer"; homepage = "https://github.com/prusa3d/PrusaSlicer";