Merge pull request #26939 from dtzWill/fix/perms-fallout-misc-2

Fixup various setuid/setgid permission problems, part 2
2017-06-30 18:30:02 +01:00
parent 9d551d021f bcaceabc3c
commit 8604630d92
11 changed files with 39 additions and 5 deletions
--- a/pkgs/os-specific/linux/firejail/default.nix
+++ b/pkgs/os-specific/linux/firejail/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
  '';

  preBuild = ''
-    sed -e "s@/etc/@$out/etc/@g" -i Makefile
+    sed -e "s@/etc/@$out/etc/@g" -e "/chmod u+s/d" -i Makefile
  '';

  meta = {
--- a/pkgs/os-specific/linux/kbdlight/default.nix
+++ b/pkgs/os-specific/linux/kbdlight/default.nix
@@ -13,7 +13,8 @@ stdenv.mkDerivation rec {

  preConfigure = ''
    substituteInPlace Makefile \
-      --replace /usr/local $out
+      --replace /usr/local $out \
+      --replace 4755 0755
  '';

  meta = with stdenv.lib; {