diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-06-17 13:23:39 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-06-17 13:23:39 +0200 |
| commit | d88c0cf8678c7accbd95010bb20ea0812a48bac5 (patch) | |
| tree | 8c14f084b42a1b2e3060f2b25aadc68906ba76d2 /pkgs/applications/misc | |
| parent | 0d4431cfe90b2242723ccb1ccc90714f2f68a609 (diff) | |
| parent | 230c0d461a7941c770f358e2b0829fe344953027 (diff) | |
| download | nixlib-d88c0cf8678c7accbd95010bb20ea0812a48bac5.tar nixlib-d88c0cf8678c7accbd95010bb20ea0812a48bac5.tar.gz nixlib-d88c0cf8678c7accbd95010bb20ea0812a48bac5.tar.bz2 nixlib-d88c0cf8678c7accbd95010bb20ea0812a48bac5.tar.lz nixlib-d88c0cf8678c7accbd95010bb20ea0812a48bac5.tar.xz nixlib-d88c0cf8678c7accbd95010bb20ea0812a48bac5.tar.zst nixlib-d88c0cf8678c7accbd95010bb20ea0812a48bac5.zip | |
Merge #26628: treewide: setuid/setgid fallout
Diffstat (limited to 'pkgs/applications/misc')
| -rw-r--r-- | pkgs/applications/misc/udevil/default.nix | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/applications/misc/udevil/default.nix b/pkgs/applications/misc/udevil/default.nix index 8ce683ec9088..9a4b795061b5 100644 --- a/pkgs/applications/misc/udevil/default.nix +++ b/pkgs/applications/misc/udevil/default.nix @@ -7,8 +7,9 @@ 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" "" + # do not set setuid bit in nix store + substituteInPlace src/Makefile.in --replace 4755 0755 ./configure \ --prefix=$out \ --with-mount-prog=${utillinux}/bin/mount \ @@ -17,10 +18,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"; |