about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorSander van der Burg <s.vanderburg@tudelft.nl>2009-05-14 11:17:41 +0000
committerSander van der Burg <s.vanderburg@tudelft.nl>2009-05-14 11:17:41 +0000
commitc0605f9d3c50ffbed97743959ef51ab524c3bfdd (patch)
tree2798411e238d056bfe773e436a1f9a899de6e6a0 /pkgs
parent5ee7338cd2a67567482ac1af16a9704866ac987f (diff)
downloadnixlib-c0605f9d3c50ffbed97743959ef51ab524c3bfdd.tar
nixlib-c0605f9d3c50ffbed97743959ef51ab524c3bfdd.tar.gz
nixlib-c0605f9d3c50ffbed97743959ef51ab524c3bfdd.tar.bz2
nixlib-c0605f9d3c50ffbed97743959ef51ab524c3bfdd.tar.lz
nixlib-c0605f9d3c50ffbed97743959ef51ab524c3bfdd.tar.xz
nixlib-c0605f9d3c50ffbed97743959ef51ab524c3bfdd.tar.zst
nixlib-c0605f9d3c50ffbed97743959ef51ab524c3bfdd.zip
Added desktop item to DOSBox
svn path=/nixpkgs/trunk/; revision=15599
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/misc/emulators/dosbox/default.nix18
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 17 insertions, 3 deletions
diff --git a/pkgs/misc/emulators/dosbox/default.nix b/pkgs/misc/emulators/dosbox/default.nix
index 2a4c66c43b91..e2bcc9fe26f3 100644
--- a/pkgs/misc/emulators/dosbox/default.nix
+++ b/pkgs/misc/emulators/dosbox/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, SDL}:
+{stdenv, fetchurl, SDL, makeDesktopItem}:
 
 stdenv.mkDerivation rec { 
   name = "dosbox-0.72";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "0ydck7jgvdwnpxakg2y83dmk2dnwx146cgidbmdn7h75y7cxfiqp";
   };
   
-  buildInputs = [SDL];
+  buildInputs = [SDL];    
   
   # Add missing includes in order to fix compilation with glibc 2.9
   patchPhase = ''
@@ -22,6 +22,20 @@ stdenv.mkDerivation rec {
     cat tmp.cpp src/shell/shell_cmds.cpp > src/shell/shell_cmds.cpp.new
     mv src/shell/shell_cmds.cpp.new src/shell/shell_cmds.cpp
   '';
+   
+  desktopItem = makeDesktopItem {
+    name = "dosbox";
+    exec = "dosbox";
+    comment = "x86 emulator with internal DOS";
+    desktopName = "DOSBox";
+    genericName = "DOS emulator";
+    categories = "Application;Emulator;";
+  };
+
+  postInstall = ''
+     ensureDir $out/share/applications
+     cp ${desktopItem}/share/applications/* $out/share/applications
+  '';
 
   meta = {
     homepage = http://www.dosbox.com/;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3ebec0f40e93..2e3d6e3cd4ce 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7505,7 +7505,7 @@ let
   };
 
   dosbox = import ../misc/emulators/dosbox {
-    inherit fetchurl stdenv SDL;
+    inherit fetchurl stdenv SDL makeDesktopItem;
   };
 
   dpkg = import ../tools/package-management/dpkg {