diff options
| author | John Ericson <Ericson2314@yahoo.com> | 2018-01-09 12:36:53 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-09 12:36:53 -0500 |
| commit | eec050f3955d803dbee1ea66706f0bca7aa7ff88 (patch) | |
| tree | 81642547f0188181195b741ea5d347a1370f9984 /nixos/modules | |
| parent | 0c16a11c9aee51fd2f1603d7f7bc2c5a6c8bfaaa (diff) | |
| parent | b2cbffae6468c34f3c315bc40aa6df4483309f00 (diff) | |
| download | nixlib-eec050f3955d803dbee1ea66706f0bca7aa7ff88.tar nixlib-eec050f3955d803dbee1ea66706f0bca7aa7ff88.tar.gz nixlib-eec050f3955d803dbee1ea66706f0bca7aa7ff88.tar.bz2 nixlib-eec050f3955d803dbee1ea66706f0bca7aa7ff88.tar.lz nixlib-eec050f3955d803dbee1ea66706f0bca7aa7ff88.tar.xz nixlib-eec050f3955d803dbee1ea66706f0bca7aa7ff88.tar.zst nixlib-eec050f3955d803dbee1ea66706f0bca7aa7ff88.zip | |
Merge pull request #33577 from dtzWill/fix/cross-2
Minor cross fixes, 2
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/security/wrappers/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix index 1f64213accd4..77e4b2a616d8 100644 --- a/nixos/modules/security/wrappers/default.nix +++ b/nixos/modules/security/wrappers/default.nix @@ -17,7 +17,7 @@ let hardeningEnable = [ "pie" ]; installPhase = '' mkdir -p $out/bin - gcc -Wall -O2 -DWRAPPER_DIR=\"${parentWrapperDir}\" \ + $CC -Wall -O2 -DWRAPPER_DIR=\"${parentWrapperDir}\" \ -lcap-ng -lcap ${./wrapper.c} -o $out/bin/security-wrapper ''; }; @@ -79,7 +79,7 @@ let ({ owner = "root"; group = "root"; } // s) - else if + else if (s ? "setuid" && s.setuid) || (s ? "setgid" && s.setgid) || (s ? "permissions") |