about summary refs log tree commit diff
diff options
context:
space:
mode:
authorTravis Athougies <iammisc@gmail.com>2018-10-22 11:11:02 -0700
committerMatthew Bauer <mjbauer95@gmail.com>2018-10-30 20:29:28 -0500
commit8cc028fd34953e03ee8e91cca141fe1f6294de82 (patch)
tree5644d8061c3bf1c02cf30dde3045c88829d5a1df
parent2603e3a5e97e5c85f828d52142f25c4a928fe1ad (diff)
downloadnixlib-8cc028fd34953e03ee8e91cca141fe1f6294de82.tar
nixlib-8cc028fd34953e03ee8e91cca141fe1f6294de82.tar.gz
nixlib-8cc028fd34953e03ee8e91cca141fe1f6294de82.tar.bz2
nixlib-8cc028fd34953e03ee8e91cca141fe1f6294de82.tar.lz
nixlib-8cc028fd34953e03ee8e91cca141fe1f6294de82.tar.xz
nixlib-8cc028fd34953e03ee8e91cca141fe1f6294de82.tar.zst
nixlib-8cc028fd34953e03ee8e91cca141fe1f6294de82.zip
nixos/networking.nix: only setup rpc on glibc
(cherry picked from commit 4177dc3f774523fea7d181601d7c3301fda13790)
and
(cherry picked from commit a2f0c95baf57fb735dd47b5db73274f7e75df7c9)
-rw-r--r--nixos/modules/config/networking.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix
index 1eb6fb43604a..627cce67e97d 100644
--- a/nixos/modules/config/networking.nix
+++ b/nixos/modules/config/networking.nix
@@ -228,9 +228,6 @@ in
         # /etc/protocols: IP protocol numbers.
         "protocols".source  = pkgs.iana-etc + "/etc/protocols";
 
-        # /etc/rpc: RPC program numbers.
-        "rpc".source = pkgs.glibc.out + "/etc/rpc";
-
         # /etc/hosts: Hostname-to-IP mappings.
         "hosts".text = let
           oneToString = set: ip: ip + " " + concatStringsSep " " set.${ip};
@@ -268,6 +265,9 @@ in
         "resolv.conf".source = "${pkgs.systemd}/lib/systemd/resolv.conf";
       } // optionalAttrs (config.services.resolved.enable && dnsmasqResolve) {
         "dnsmasq-resolv.conf".source = "/run/systemd/resolve/resolv.conf";
+      } // optionalAttrs (pkgs.stdenv.hostPlatform.libc == "glibc") {
+        # /etc/rpc: RPC program numbers.
+        "rpc".source = pkgs.glibc.out + "/etc/rpc";
       };
 
       networking.proxy.envVars =