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 | |
| parent | 0c16a11c9aee51fd2f1603d7f7bc2c5a6c8bfaaa (diff) | |
| parent | b2cbffae6468c34f3c315bc40aa6df4483309f00 (diff) | |
Merge pull request #33577 from dtzWill/fix/cross-2
Minor cross fixes, 2
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/lib/make-ext4-fs.nix | 2 | ||||
| -rw-r--r-- | nixos/lib/make-squashfs.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/security/wrappers/default.nix | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/nixos/lib/make-ext4-fs.nix b/nixos/lib/make-ext4-fs.nix index f06649e1991a5..21c69ed560a32 100644 --- a/nixos/lib/make-ext4-fs.nix +++ b/nixos/lib/make-ext4-fs.nix @@ -10,7 +10,7 @@ pkgs.stdenv.mkDerivation { name = "ext4-fs.img"; - buildInputs = with pkgs; [e2fsprogs libfaketime perl]; + nativeBuildInputs = with pkgs; [e2fsprogs libfaketime perl]; # For obtaining the closure of `storePaths'. exportReferencesGraph = diff --git a/nixos/lib/make-squashfs.nix b/nixos/lib/make-squashfs.nix index e66c0ae8f6615..9d47a3222cc27 100644 --- a/nixos/lib/make-squashfs.nix +++ b/nixos/lib/make-squashfs.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { name = "squashfs.img"; - buildInputs = [perl squashfsTools]; + nativeBuildInputs = [perl squashfsTools]; # For obtaining the closure of `storeContents'. exportReferencesGraph = diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix index 1f64213accd46..77e4b2a616d8e 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") |