public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #16384 from Ericson2314/top-level-to-path

Browse Source 
top-level: builtins.toPath no longer needed
This commit is contained in:
zimbatm 2016-06-21 14:21:01 +01:00 committed by GitHub
commit afbba2bffa
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/top-level/default.nix
View File

@ -44,10 +44,7 @@ let
# for NIXOS (nixos-rebuild): use nixpkgs.config option # for NIXOS (nixos-rebuild): use nixpkgs.config option
config = config =
let let
toPath = builtins.toPath; inherit (builtins) getEnv pathExists;
getEnv = builtins.getEnv;
pathExists = name:
builtins.pathExists (toPath name);
configFile = getEnv "NIXPKGS_CONFIG"; configFile = getEnv "NIXPKGS_CONFIG";
homeDir = getEnv "HOME"; homeDir = getEnv "HOME";
@ -55,8 +52,8 @@ let
configExpr = configExpr =
if config_ != null then config_ if config_ != null then config_
else if configFile != "" && pathExists configFile then import (toPath configFile) else if configFile != "" && pathExists configFile then import configFile
else if homeDir != "" && pathExists configFile2 then import (toPath configFile2) else if homeDir != "" && pathExists configFile2 then import configFile2
else {}; else {};
in in