diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-09-24 21:49:07 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-09-24 21:49:07 +0000 |
| commit | dbda65a6f37a00338e10abf6adc096f8be236e7e (patch) | |
| tree | e4f86454f35de8779fe901acae39e05508107bc7 /pkgs/top-level/all-packages.nix | |
| parent | ed58e70864e139ecf39ddaf82b559367bfb28d81 (diff) | |
| download | nixpkgs-dbda65a6f37a00338e10abf6adc096f8be236e7e.tar nixpkgs-dbda65a6f37a00338e10abf6adc096f8be236e7e.tar.gz nixpkgs-dbda65a6f37a00338e10abf6adc096f8be236e7e.tar.bz2 nixpkgs-dbda65a6f37a00338e10abf6adc096f8be236e7e.tar.lz nixpkgs-dbda65a6f37a00338e10abf6adc096f8be236e7e.tar.xz nixpkgs-dbda65a6f37a00338e10abf6adc096f8be236e7e.tar.zst nixpkgs-dbda65a6f37a00338e10abf6adc096f8be236e7e.zip | |
* Check for the existence of getEnv.
svn path=/nixpkgs/trunk/; revision=6600
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 7 |
1 files 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 = |