diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-06-17 14:38:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-17 14:38:42 +0200 |
| commit | f81fc6b5aca83d856cc89be113ce4dcd21e3b2b8 (patch) | |
| tree | afaa55e9e889e6f1caafbfb3b10028e8a4c7aeed /pkgs/top-level | |
| parent | 0902fd29d0014515eecf4dde2b1f299059780e59 (diff) | |
| parent | bec28d748c854abda373ca38831f4e77bc276fc1 (diff) | |
| download | nixlib-f81fc6b5aca83d856cc89be113ce4dcd21e3b2b8.tar nixlib-f81fc6b5aca83d856cc89be113ce4dcd21e3b2b8.tar.gz nixlib-f81fc6b5aca83d856cc89be113ce4dcd21e3b2b8.tar.bz2 nixlib-f81fc6b5aca83d856cc89be113ce4dcd21e3b2b8.tar.lz nixlib-f81fc6b5aca83d856cc89be113ce4dcd21e3b2b8.tar.xz nixlib-f81fc6b5aca83d856cc89be113ce4dcd21e3b2b8.tar.zst nixlib-f81fc6b5aca83d856cc89be113ce4dcd21e3b2b8.zip | |
Merge pull request #16289 from zimbatm/old-nix-cleanup
Remove unecessary branching on old nix versions
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index 4de75c2ed57e..22964195ed6a 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -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"; |