Skip to content

Commit

Permalink
vlock: Don't try to install setuid binary
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
aszlig committed Jun 22, 2017
1 parent 7a99036 commit 4007ee9
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion pkgs/misc/screensavers/vlock/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 ];
Expand Down

0 comments on commit 4007ee9

Please sign in to comment.