From bec28d748c854abda373ca38831f4e77bc276fc1 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Fri, 17 Jun 2016 11:06:48 +0100
Subject: Remove unecessary branching on old nix versions

All these builtins are available since 1.10 or earlier (1.10 being the
lib/minver.nix)
---
 pkgs/top-level/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/top-level')

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";
-- 
cgit 1.4.1