From 9de0b2883ac4778c7c8fae57f9efeb4d773bdd08 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 24 Mar 2018 15:33:47 -0500 Subject: [PATCH] nixos: use pkgs.getent and stdenv.cc.libc (cherry picked from commit 52eba9753aeba4f02c8ce0de50f10bd98de1ef1e) --- nixos/modules/config/system-path.nix | 4 +++- nixos/modules/system/activation/activation-script.nix | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix index c07e19bd03c..1793dc628ed 100644 --- a/nixos/modules/config/system-path.nix +++ b/nixos/modules/config/system-path.nix @@ -19,7 +19,9 @@ let pkgs.diffutils pkgs.findutils pkgs.gawk - pkgs.glibc # for ldd, getent + pkgs.stdenv.cc.libc + pkgs.getent + pkgs.getconf pkgs.gnugrep pkgs.gnupatch pkgs.gnused diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix index b1eaf018956..0ed7c0f53eb 100644 --- a/nixos/modules/system/activation/activation-script.nix +++ b/nixos/modules/system/activation/activation-script.nix @@ -21,7 +21,7 @@ let [ coreutils gnugrep findutils - glibc # needed for getent + getent shadow nettools # needed for hostname utillinux # needed for mount and mountpoint