From 4007ee974c68a65444d939312ffe308297bdd3f6 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 22 Jun 2017 04:01:27 +0200 Subject: vlock: Don't try to install setuid binary With newer Nix it's (fortunately) no longer possible to create a file with setuid bits, even though the permissions are fixed later the build will fail during installPhase already. I've verified whether the contents of the output path are the same as before this change and the contents match. Signed-off-by: aszlig --- pkgs/misc/screensavers/vlock/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pkgs/misc/screensavers') diff --git a/pkgs/misc/screensavers/vlock/default.nix b/pkgs/misc/screensavers/vlock/default.nix index 031afeeca2fc..0e5e87245f32 100644 --- a/pkgs/misc/screensavers/vlock/default.nix +++ b/pkgs/misc/screensavers/vlock/default.nix @@ -9,7 +9,9 @@ stdenv.mkDerivation { }; prePatch = '' - sed -i -e '/INSTALL/s/-[og] [^ ]*//g' Makefile modules/Makefile + sed -i -e '/INSTALL/ { + s/-[og] [^ ]*//g; s/4711/755/ + }' Makefile modules/Makefile ''; patches = [ ./eintr.patch ]; -- cgit 1.4.1