diff options
| author | Will Dietz <w@wdtz.org> | 2018-03-24 15:33:47 -0500 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-10-30 19:49:43 -0500 |
| commit | 9de0b2883ac4778c7c8fae57f9efeb4d773bdd08 (patch) | |
| tree | 5847523a4d382fbe484ee9c4940af48f9771df9a /nixos | |
| parent | 2d0ec8b28873bc6b933b10ed2aa6411237a625f5 (diff) | |
| download | nixlib-9de0b2883ac4778c7c8fae57f9efeb4d773bdd08.tar nixlib-9de0b2883ac4778c7c8fae57f9efeb4d773bdd08.tar.gz nixlib-9de0b2883ac4778c7c8fae57f9efeb4d773bdd08.tar.bz2 nixlib-9de0b2883ac4778c7c8fae57f9efeb4d773bdd08.tar.lz nixlib-9de0b2883ac4778c7c8fae57f9efeb4d773bdd08.tar.xz nixlib-9de0b2883ac4778c7c8fae57f9efeb4d773bdd08.tar.zst nixlib-9de0b2883ac4778c7c8fae57f9efeb4d773bdd08.zip | |
nixos: use pkgs.getent and stdenv.cc.libc
(cherry picked from commit 52eba9753aeba4f02c8ce0de50f10bd98de1ef1e)
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/config/system-path.nix | 4 | ||||
| -rw-r--r-- | 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 c07e19bd03c4..1793dc628edf 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 b1eaf0189562..0ed7c0f53eb9 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 |