Merge pull request #16289 from zimbatm/old-nix-cleanup

Remove unecessary branching on old nix versions
This commit is contained in:
Eelco Dolstra
2016-06-17 14:38:42 +02:00
committed by GitHub
3 changed files with 15 additions and 73 deletions

View File

@@ -45,9 +45,9 @@ let
config =
let
toPath = builtins.toPath;
getEnv = x: if builtins ? getEnv then builtins.getEnv x else "";
getEnv = builtins.getEnv;
pathExists = name:
builtins ? pathExists && builtins.pathExists (toPath name);
builtins.pathExists (toPath name);
configFile = getEnv "NIXPKGS_CONFIG";
homeDir = getEnv "HOME";