From f4ec18aaaca9e46b4f304d2a7f5f06bd6222c0e5 Mon Sep 17 00:00:00 2001
From: xeji <36407913+xeji@users.noreply.github.com>
Date: Sun, 20 May 2018 01:01:42 +0200
Subject: nixos/cjdns: fix service for i686 (#40740)

service failed to start because of MemoryDenyWriteExecute = true,
which seems not to work on i686
---
 nixos/modules/services/networking/cjdns.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'nixos')

diff --git a/nixos/modules/services/networking/cjdns.nix b/nixos/modules/services/networking/cjdns.nix
index 12c2677c3368..39b62bdc7094 100644
--- a/nixos/modules/services/networking/cjdns.nix
+++ b/nixos/modules/services/networking/cjdns.nix
@@ -260,7 +260,8 @@ in
         RestartSec = 1;
         CapabilityBoundingSet = "CAP_NET_ADMIN CAP_NET_RAW CAP_SETUID";
         ProtectSystem = true;
-        MemoryDenyWriteExecute = true;
+        # Doesn't work on i686, causing service to fail
+        MemoryDenyWriteExecute = !pkgs.stdenv.isi686;
         ProtectHome = true;
         PrivateTmp = true;
       };
-- 
cgit v1.2.3