summary refs log tree commit diff
path: root/pkgs/top-level/default.nix
diff options
context:
space:
mode:
authorzimbatm <zimbatm@zimbatm.com>2016-06-17 11:06:48 +0100
committerzimbatm <zimbatm@zimbatm.com>2016-06-17 11:06:48 +0100
commitbec28d748c854abda373ca38831f4e77bc276fc1 (patch)
tree6dad75becf4d734218891b5bd7a5e476faa5735d /pkgs/top-level/default.nix
parent9bbac1f4eac3a880607d3ba6990fcb00fd031611 (diff)
downloadnixpkgs-bec28d748c854abda373ca38831f4e77bc276fc1.tar
nixpkgs-bec28d748c854abda373ca38831f4e77bc276fc1.tar.gz
nixpkgs-bec28d748c854abda373ca38831f4e77bc276fc1.tar.bz2
nixpkgs-bec28d748c854abda373ca38831f4e77bc276fc1.tar.lz
nixpkgs-bec28d748c854abda373ca38831f4e77bc276fc1.tar.xz
nixpkgs-bec28d748c854abda373ca38831f4e77bc276fc1.tar.zst
nixpkgs-bec28d748c854abda373ca38831f4e77bc276fc1.zip
Remove unecessary branching on old nix versions
All these builtins are available since 1.10 or earlier (1.10 being the
lib/minver.nix)
Diffstat (limited to 'pkgs/top-level/default.nix')
-rw-r--r--pkgs/top-level/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix
index 4de75c2ed57..22964195ed6 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";