From bdc3de6a4dbf4f0520033b19bcdb2d37eb590348 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 20 Mar 2012 18:28:32 +0000
Subject: [PATCH] Pommed: find the 'eject' command in
 /var/setuid-wrappers:/home/shlevy/.nix-profile/bin:/home/shlevy/.nix-profile/sbin:/home/shlevy/.nix-profile/lib/kde4/libexec:/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/nix/var/nix/profiles/default/lib/kde4/libexec:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin:/var/run/current-system/sw/lib/kde4/libexec

svn path=/nixpkgs/trunk/; revision=33302
---
 pkgs/os-specific/linux/pommed/default.nix            |  4 +---
 .../linux/pommed/find-eject-in-path.patch            | 12 ++++++++++++
 2 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/os-specific/linux/pommed/find-eject-in-path.patch

diff --git a/pkgs/os-specific/linux/pommed/default.nix b/pkgs/os-specific/linux/pommed/default.nix
index d8ccaebea8c9..d6c06eca12fb 100644
--- a/pkgs/os-specific/linux/pommed/default.nix
+++ b/pkgs/os-specific/linux/pommed/default.nix
@@ -6,7 +6,6 @@
 , dbus, dbus_glib
 , alsaLib
 , audiofile
-, eject
 , pkgconfig
 , gtk
 , gettext
@@ -30,7 +29,7 @@ stdenv.mkDerivation rec {
     sha256 = "18lxywmikanjr5pk1jdqda88dxd2579fpyd332xn4njjhlgwy5fp";
   };
 
-  patches = [ build_flags_patch ];
+  patches = [ build_flags_patch ./find-eject-in-path.patch ];
 
   buildInputs = [
     pciutils
@@ -38,7 +37,6 @@ stdenv.mkDerivation rec {
     dbus
     alsaLib
     audiofile
-    eject
     dbus_glib
     pkgconfig
     gtk
diff --git a/pkgs/os-specific/linux/pommed/find-eject-in-path.patch b/pkgs/os-specific/linux/pommed/find-eject-in-path.patch
new file mode 100644
index 000000000000..d021a0290eeb
--- /dev/null
+++ b/pkgs/os-specific/linux/pommed/find-eject-in-path.patch
@@ -0,0 +1,12 @@
+diff -Naur pommed-1.39-orig/pommed/cd_eject.c pommed-1.39/pommed/cd_eject.c
+--- pommed-1.39-orig/pommed/cd_eject.c	2011-06-02 05:24:05.000000000 -0400
++++ pommed-1.39/pommed/cd_eject.c	2012-03-20 14:25:33.397712520 -0400
+@@ -100,7 +100,7 @@
+       for (fd = 3; fd < max_fd; fd++)
+ 	close(fd);
+ 
+-      execve("/usr/bin/eject", eject_argv, eject_envp);
++      execvpe("eject", eject_argv, eject_envp);
+ 
+       logmsg(LOG_ERR, "Could not execute eject: %s", strerror(errno));
+       exit(1);