about summary refs log tree commit diff
path: root/pkgs/by-name/do
diff options
context:
space:
mode:
authorJohn Titor <50095635+JohnRTitor@users.noreply.github.com>2024-05-12 20:15:09 +0530
committerJohn Titor <50095635+JohnRTitor@users.noreply.github.com>2024-05-13 16:50:29 +0530
commit1a0c12d45e430c48b9c7038da373e265650ece6e (patch)
tree5b947e1a4c278fed7ab864e30bfda898d4258db6 /pkgs/by-name/do
parent5e304f6043bfd9ec032d25418fa339d2ee11c78e (diff)
dosbox-staging: use .desktop from source, add missing deps
add zlib-ng dependency
Diffstat (limited to 'pkgs/by-name/do')
-rw-r--r--pkgs/by-name/do/dosbox-staging/package.nix22
1 files changed, 5 insertions, 17 deletions
diff --git a/pkgs/by-name/do/dosbox-staging/package.nix b/pkgs/by-name/do/dosbox-staging/package.nix
index 2214dca493ea0..1241385322b8a 100644
--- a/pkgs/by-name/do/dosbox-staging/package.nix
+++ b/pkgs/by-name/do/dosbox-staging/package.nix
@@ -6,7 +6,6 @@
   SDL2_image,
   SDL2_net,
   alsa-lib,
-  copyDesktopItems,
   darwin,
   fluidsynth,
   glib,
@@ -18,10 +17,10 @@
   libmt32emu,
   libogg,
   libpng,
+  zlib-ng,
   libpulseaudio,
   libslirp,
   libsndfile,
-  makeDesktopItem,
   makeWrapper,
   meson,
   ninja,
@@ -43,7 +42,6 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   nativeBuildInputs = [
-    copyDesktopItems
     gtest
     makeWrapper
     meson
@@ -62,6 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
       libmt32emu
       libogg
       libpng
+      zlib-ng
       libpulseaudio
       libslirp
       libsndfile
@@ -81,20 +80,9 @@ stdenv.mkDerivation (finalAttrs: {
       ]
     );
 
-  desktopItems = [
-    (makeDesktopItem {
-      name = "dosbox-staging";
-      exec = "dosbox-staging";
-      icon = "dosbox-staging";
-      comment = "x86 dos emulator enhanced";
-      desktopName = "DosBox-Staging";
-      genericName = "DOS emulator";
-      categories = [
-        "Emulator"
-        "Game"
-      ];
-    })
-  ];
+  postInstall = ''
+    install -Dm644 $src/contrib/linux/dosbox-staging.desktop $out/share/applications/
+  '';
 
   postFixup = ''
     # Rename binary, add a wrapper, and copy manual to avoid conflict with