shithub: m8c

Download patch

ref: cab4b51b1e24d09f0201c4a759f7a7043157b608
parent: 10c5f04ba4198703cb206716de2691b629104454
author: K. Adam Christensen <pope@shifteleven.com>
date: Sun Sep 14 12:50:01 EDT 2025 

Add the new m8c icons and restructure the install

Moved more of the declarations to the CMakeLists files, and out of the
flake to put installation all in one place.

Signed-off-by: K. Adam Christensen <pope@shifteleven.com>


--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -110,6 +110,8 @@
     include(CPack)
 elseif (UNIX)
     install(TARGETS ${APP_NAME})
+    install(DIRECTORY package/share/applications DESTINATION share/applications)
+    install(DIRECTORY package/share/icons DESTINATION share/icons)
     install(FILES AUDIOGUIDE.md README.md LICENSE DESTINATION share/doc/${APP_NAME})
     install(FILES gamecontrollerdb.txt DESTINATION bin/)
 endif ()
--- a/flake.nix
+++ b/flake.nix
@@ -19,8 +19,6 @@
       m8c-package =
         { stdenv
         , cmake
-        , copyDesktopItems
-        , makeDesktopItem
         , pkg-config
         , sdl3
         , libserialport
@@ -29,25 +27,8 @@
           inherit pname version;
           src = ./.;
 
-          nativeBuildInputs = [ cmake copyDesktopItems pkg-config ];
+          nativeBuildInputs = [ cmake pkg-config ];
           buildInputs = [ sdl3 libserialport ];
-
-          postInstall = ''
-            for size in 32x32 128x128 256x256 512x512 1024x1024; do
-              install -Dm 644 $src/package/icons/hicolor/$size/apps/m8c.png \
-                  $out/share/icons/hicolor/$size/apps/${pname}.png
-            done
-          '';
-
-          desktopItems = [
-            (makeDesktopItem {
-              name = pname;
-              exec = pname;
-              icon = pname;
-              desktopName = pname;
-              categories = [ "Audio" "AudioVideo" ];
-            })
-          ];
         };
       eachSystem = f: nixpkgs.lib.genAttrs (import systems) (system: f
         (import nixpkgs { inherit system; })
binary files a/package/icons/hicolor/1024x1024/apps/m8c.png /dev/null differ
binary files a/package/icons/hicolor/128x128/apps/m8c.png /dev/null differ
binary files a/package/icons/hicolor/256x256/apps/m8c.png /dev/null differ
binary files a/package/icons/hicolor/32x32/apps/m8c.png /dev/null differ
binary files a/package/icons/hicolor/512x512/apps/m8c.png /dev/null differ
--- /dev/null
+++ b/package/share/applications/m8c.desktop
@@ -1,0 +1,7 @@
+[Desktop Entry]
+Type=Application
+Name=m8c
+Exec=m8c
+Icon=m8c
+Categories=Audio;AudioVideo
+Version=1.4
binary files /dev/null b/package/share/icons/hicolor/1024x1024/apps/m8c.png differ
binary files /dev/null b/package/share/icons/hicolor/128x128/apps/m8c.png differ
binary files /dev/null b/package/share/icons/hicolor/256x256/apps/m8c.png differ
binary files /dev/null b/package/share/icons/hicolor/32x32/apps/m8c.png differ
binary files /dev/null b/package/share/icons/hicolor/48x48/apps/m8c.png differ
binary files /dev/null b/package/share/icons/hicolor/512x512/apps/m8c.png differ
binary files /dev/null b/package/share/icons/hicolor/64x64/apps/m8c.png differ
-- 
⑨