about summary refs log tree commit diff
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2017-06-22 04:01:27 +0200
committeraszlig <aszlig@redmoonstudios.org>2017-06-22 04:01:27 +0200
commit4007ee974c68a65444d939312ffe308297bdd3f6 (patch)
tree4c44a0e5bce42cb57b939010c60d8af4c741aab0
parent7a99036cef70dd00cc8a4a5be04ea4a25ab0dca4 (diff)
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 <aszlig@redmoonstudios.org>
-rw-r--r--pkgs/misc/screensavers/vlock/default.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/misc/screensavers/vlock/default.nix b/pkgs/misc/screensavers/vlock/default.nix
index 031afeeca2fc8..0e5e87245f32d 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 ];