diff options
| author | Joachim F <joachifm@users.noreply.github.com> | 2017-06-30 18:30:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-30 18:30:02 +0100 |
| commit | 8604630d9234cc54eef3a0dbaf10247f528cffa5 (patch) | |
| tree | 9ea8625284300dc23ab663dfeb2ec6fba3ae0cf7 /pkgs/os-specific | |
| parent | 9d551d021f6cfaa56a2d24075aca198288969443 (diff) | |
| parent | bcaceabc3c5076b36ab451e6f23a9d9c1df940c1 (diff) | |
| download | nixlib-8604630d9234cc54eef3a0dbaf10247f528cffa5.tar nixlib-8604630d9234cc54eef3a0dbaf10247f528cffa5.tar.gz nixlib-8604630d9234cc54eef3a0dbaf10247f528cffa5.tar.bz2 nixlib-8604630d9234cc54eef3a0dbaf10247f528cffa5.tar.lz nixlib-8604630d9234cc54eef3a0dbaf10247f528cffa5.tar.xz nixlib-8604630d9234cc54eef3a0dbaf10247f528cffa5.tar.zst nixlib-8604630d9234cc54eef3a0dbaf10247f528cffa5.zip | |
Merge pull request #26939 from dtzWill/fix/perms-fallout-misc-2
Fixup various setuid/setgid permission problems, part 2
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/firejail/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kbdlight/default.nix | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix index cf7fe8fc8418..1bbe8dbb160b 100644 --- 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 = { diff --git a/pkgs/os-specific/linux/kbdlight/default.nix b/pkgs/os-specific/linux/kbdlight/default.nix index 1bc07f357a8a..44a63c9f1ece 100644 --- 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; { |