summary refs log tree commit diff
path: root/pkgs/applications/misc
diff options
context:
space:
mode:
authorWill Dietz <w@wdtz.org>2017-06-16 06:54:39 -0500
committerWill Dietz <w@wdtz.org>2017-06-16 06:57:08 -0500
commit98b2e4816f0f2d638268f896bd79c69c28a4fe77 (patch)
treeaf53f15e0e292f471e7022336dd21a8bcc50706d /pkgs/applications/misc
parent4d57153659a2c3a47aa297a396f04a6c62d6efbb (diff)
downloadnixlib-98b2e4816f0f2d638268f896bd79c69c28a4fe77.tar
nixlib-98b2e4816f0f2d638268f896bd79c69c28a4fe77.tar.gz
nixlib-98b2e4816f0f2d638268f896bd79c69c28a4fe77.tar.bz2
nixlib-98b2e4816f0f2d638268f896bd79c69c28a4fe77.tar.lz
nixlib-98b2e4816f0f2d638268f896bd79c69c28a4fe77.tar.xz
nixlib-98b2e4816f0f2d638268f896bd79c69c28a4fe77.tar.zst
nixlib-98b2e4816f0f2d638268f896bd79c69c28a4fe77.zip
udevil: minor cleanup, fix setuid/setgid problems
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r--pkgs/applications/misc/udevil/default.nix6
1 files changed, 1 insertions, 5 deletions
diff --git a/pkgs/applications/misc/udevil/default.nix b/pkgs/applications/misc/udevil/default.nix
index 8ce683ec9088..83ebef7f10da 100644
--- a/pkgs/applications/misc/udevil/default.nix
+++ b/pkgs/applications/misc/udevil/default.nix
@@ -7,8 +7,8 @@ stdenv.mkDerivation {
   };
   buildInputs = [ intltool glib pkgconfig udev ];
   configurePhase = ''
-    substituteInPlace src/Makefile.am --replace "-o root -g root" ""
     substituteInPlace src/Makefile.in --replace "-o root -g root" ""
+    substituteInPlace src/Makefile.in --replace 4755 0755
     ./configure \
       --prefix=$out \
       --with-mount-prog=${utillinux}/bin/mount \
@@ -17,10 +17,6 @@ stdenv.mkDerivation {
       --with-setfacl-prog=${acl.bin}/bin/setfacl \
       --sysconfdir=$prefix/etc
   '';
-  preConfigure = ''
-    cat src/Makefile.am
-    exit 2
-  '';
   patches = [ ./device-info-sys-stat.patch ];
   meta = {
     description = "A command line Linux program which mounts and unmounts removable devices without a password, shows device info, and monitors device changes";