diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-09-25 11:54:23 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-25 11:54:23 +0100 |
commit | 756698f0a737e0654900a2fdc74c5d2e1769f964 (patch) | |
tree | 125030b193406b6d121453b0d0898377d1f213cf | |
parent | a8c97ad23e21284d4e05b4de1a5e19cbb061d777 (diff) | |
parent | ff4d7f0fd2122e0e8bffeb10bc32927c280a1fd9 (diff) | |
download | nixlib-756698f0a737e0654900a2fdc74c5d2e1769f964.tar nixlib-756698f0a737e0654900a2fdc74c5d2e1769f964.tar.gz nixlib-756698f0a737e0654900a2fdc74c5d2e1769f964.tar.bz2 nixlib-756698f0a737e0654900a2fdc74c5d2e1769f964.tar.lz nixlib-756698f0a737e0654900a2fdc74c5d2e1769f964.tar.xz nixlib-756698f0a737e0654900a2fdc74c5d2e1769f964.tar.zst nixlib-756698f0a737e0654900a2fdc74c5d2e1769f964.zip |
Merge pull request #29765 from nlewo/pr/docker-nix-pager-env-var
dockerTools.examples.nix: set NIX_PAGER=cat environment variable
-rw-r--r-- | pkgs/build-support/docker/examples.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index 1a8b9c7f8ed4..498028fb0886 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -107,11 +107,13 @@ rec { nix = buildImageWithNixDb { name = "nix"; contents = [ - # nix-store -qR uses the 'more' program which is not included in - # the pkgs.nix dependencies. We then have to manually get it - # from the 'eject' package:/ - pkgs.eject + # nix-store uses cat program to display results as specified by + # the image env variable NIX_PAGER. + pkgs.coreutils pkgs.nix ]; + config = { + Env = [ "NIX_PAGER=cat" ]; + }; }; } |