public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Shea Levy 2012-03-20 18:28:32 +00:00
parent 8d1d247e02
commit bdc3de6a4d
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/os-specific/linux/pommed/default.nix
View File

@ -6,7 +6,6 @@
, dbus, dbus_glib , dbus, dbus_glib
, alsaLib , alsaLib
, audiofile , audiofile
, eject
, pkgconfig , pkgconfig
, gtk , gtk
, gettext , gettext
@ -30,7 +29,7 @@ stdenv.mkDerivation rec {
sha256 = "18lxywmikanjr5pk1jdqda88dxd2579fpyd332xn4njjhlgwy5fp"; sha256 = "18lxywmikanjr5pk1jdqda88dxd2579fpyd332xn4njjhlgwy5fp";
}; };
patches = [ build_flags_patch ]; patches = [ build_flags_patch ./find-eject-in-path.patch ];
buildInputs = [ buildInputs = [
pciutils pciutils
@ -38,7 +37,6 @@ stdenv.mkDerivation rec {
dbus dbus
alsaLib alsaLib
audiofile audiofile
eject
dbus_glib dbus_glib
pkgconfig pkgconfig
gtk gtk

12
pkgs/os-specific/linux/pommed/find-eject-in-path.patch Normal file
View File

@ -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);