diff options
author | Orivej Desh <orivej@gmx.fr> | 2017-09-01 00:46:26 +0000 |
---|---|---|
committer | Orivej Desh <orivej@gmx.fr> | 2017-09-01 01:01:24 +0000 |
commit | d70006c6d95d581db203492514ea3fc82d61113b (patch) | |
tree | b4e4c54f84432525b0a07924f56696a685869514 /pkgs/os-specific/linux/busybox | |
parent | 46d6fecf787a5f9b05e1edfc1952bcbd9ec6fc7a (diff) | |
download | nixpkgs-d70006c6d95d581db203492514ea3fc82d61113b.tar nixpkgs-d70006c6d95d581db203492514ea3fc82d61113b.tar.gz nixpkgs-d70006c6d95d581db203492514ea3fc82d61113b.tar.bz2 nixpkgs-d70006c6d95d581db203492514ea3fc82d61113b.tar.lz nixpkgs-d70006c6d95d581db203492514ea3fc82d61113b.tar.xz nixpkgs-d70006c6d95d581db203492514ea3fc82d61113b.tar.zst nixpkgs-d70006c6d95d581db203492514ea3fc82d61113b.zip |
mkDerivation: fix hardening flags check
- allow "all" in hardeningDisable - fix busybox flags - print detailed error message Discussed at https://github.com/NixOS/nixpkgs/pull/28555#issuecomment-326413032
Diffstat (limited to 'pkgs/os-specific/linux/busybox')
-rw-r--r-- | pkgs/os-specific/linux/busybox/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index ee897fc3781..6c9c43e4e5a 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { sha256 = "1pv3vs2w4l2wnw5qb0rkbpvjjdd1fwjv87miavqq0r0ynqbfajwx"; }; - hardeningDisable = [ "format" ] ++ lib.optional enableStatic [ "fortify" ]; + hardeningDisable = [ "format" ] ++ lib.optionals enableStatic [ "fortify" ]; patches = [ ./busybox-in-store.patch ]; |