diff options
| author | zimbatm <zimbatm@zimbatm.com> | 2016-06-21 14:21:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-21 14:21:01 +0100 |
| commit | afbba2bffa8ce4b627e6dfc7d3c76909bb959144 (patch) | |
| tree | 8bd4928264f66cf444b411ddd6701e65fd3e4327 /pkgs/top-level | |
| parent | f3950f712fbd85ced8098bb19b99b5150fbf180b (diff) | |
| parent | 98b9403a2227ce1e626c96b49955ea22d7f9c715 (diff) | |
| download | nixlib-afbba2bffa8ce4b627e6dfc7d3c76909bb959144.tar nixlib-afbba2bffa8ce4b627e6dfc7d3c76909bb959144.tar.gz nixlib-afbba2bffa8ce4b627e6dfc7d3c76909bb959144.tar.bz2 nixlib-afbba2bffa8ce4b627e6dfc7d3c76909bb959144.tar.lz nixlib-afbba2bffa8ce4b627e6dfc7d3c76909bb959144.tar.xz nixlib-afbba2bffa8ce4b627e6dfc7d3c76909bb959144.tar.zst nixlib-afbba2bffa8ce4b627e6dfc7d3c76909bb959144.zip | |
Merge pull request #16384 from Ericson2314/top-level-to-path
top-level: builtins.toPath no longer needed
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/default.nix | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index 22964195ed6a..bf3522d5946a 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -44,10 +44,7 @@ let # for NIXOS (nixos-rebuild): use nixpkgs.config option config = let - toPath = builtins.toPath; - getEnv = builtins.getEnv; - pathExists = name: - builtins.pathExists (toPath name); + inherit (builtins) getEnv pathExists; configFile = getEnv "NIXPKGS_CONFIG"; homeDir = getEnv "HOME"; @@ -55,8 +52,8 @@ let configExpr = if config_ != null then config_ - else if configFile != "" && pathExists configFile then import (toPath configFile) - else if homeDir != "" && pathExists configFile2 then import (toPath configFile2) + else if configFile != "" && pathExists configFile then import configFile + else if homeDir != "" && pathExists configFile2 then import configFile2 else {}; in |