Author: shlevy
Date: Tue Mar 20 18:28:32 2012
New Revision: 33302
URL: https://nixos.org/websvn/nix/?rev=33302&sc=1
Log:
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
Added:
nixpkgs/trunk/pkgs/os-specific/linux/pommed/find-eject-in-path.patch
Modified:
nixos/trunk/modules/services/hardware/pommed.nix
nixpkgs/trunk/pkgs/os-specific/linux/pommed/default.nix
Modified: nixos/trunk/modules/services/hardware/pommed.nix
==============================================================================
--- nixos/trunk/modules/services/hardware/pommed.nix Tue Mar 20 16:30:43
2012 (r33301)
+++ nixos/trunk/modules/services/hardware/pommed.nix Tue Mar 20 18:28:32
2012 (r33302)
@@ -42,6 +42,8 @@
exec = "${pkgs.pommed}/bin/pommed";
daemonType = "fork";
+
+ path = [ pkgs.eject ];
};
};
}
Modified: nixpkgs/trunk/pkgs/os-specific/linux/pommed/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/pommed/default.nix Tue Mar 20
16:30:43 2012 (r33301)
+++ nixpkgs/trunk/pkgs/os-specific/linux/pommed/default.nix Tue Mar 20
18:28:32 2012 (r33302)
@@ -6,7 +6,6 @@
, dbus, dbus_glib
, alsaLib
, audiofile
-, eject
, pkgconfig
, gtk
, gettext
@@ -30,7 +29,7 @@
sha256 = "18lxywmikanjr5pk1jdqda88dxd2579fpyd332xn4njjhlgwy5fp";
};
- patches = [ build_flags_patch ];
+ patches = [ build_flags_patch ./find-eject-in-path.patch ];
buildInputs = [
pciutils
@@ -38,7 +37,6 @@
dbus
alsaLib
audiofile
- eject
dbus_glib
pkgconfig
gtk
Added: nixpkgs/trunk/pkgs/os-specific/linux/pommed/find-eject-in-path.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/os-specific/linux/pommed/find-eject-in-path.patch
Tue Mar 20 18:28:32 2012 (r33302)
@@ -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);
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
