From 98b2e4816f0f2d638268f896bd79c69c28a4fe77 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 16 Jun 2017 06:54:39 -0500 Subject: [PATCH] udevil: minor cleanup, fix setuid/setgid problems --- pkgs/applications/misc/udevil/default.nix | 6 +----- 1 file changed, 1 insertion(+), 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";