From dbda65a6f37a00338e10abf6adc096f8be236e7e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 24 Sep 2006 21:49:07 +0000 Subject: [PATCH] * Check for the existence of getEnv. svn path=/nixpkgs/trunk/; revision=6600 --- pkgs/top-level/all-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c268e0cef84..5ecb5447c7c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -99,11 +99,12 @@ rec { config = let { toPath = builtins.toPath; + getEnv = x: if builtins ? getEnv then builtins.getEnv x else ""; pathExists = name: builtins ? pathExists && builtins.pathExists (toPath name); - - configFile = builtins.getEnv "NIXPKGS_CONFIG"; - homeDir = builtins.getEnv "HOME"; + + configFile = getEnv "NIXPKGS_CONFIG"; + homeDir = getEnv "HOME"; configFile2 = homeDir + "/.nixpkgs/config.nix"; body =