diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-01-12 22:53:13 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-01-12 22:53:13 +0000 |
| commit | cfed953b5f304164a66d42e55f51d02cff793f77 (patch) | |
| tree | 49fe195cc0b60efd0d46d20b8dd4e19aa474680e /default.nix | |
| parent | 4475a74fb8a6142a495cc97edc340dd81078eb4c (diff) | |
| download | nixlib-cfed953b5f304164a66d42e55f51d02cff793f77.tar nixlib-cfed953b5f304164a66d42e55f51d02cff793f77.tar.gz nixlib-cfed953b5f304164a66d42e55f51d02cff793f77.tar.bz2 nixlib-cfed953b5f304164a66d42e55f51d02cff793f77.tar.lz nixlib-cfed953b5f304164a66d42e55f51d02cff793f77.tar.xz nixlib-cfed953b5f304164a66d42e55f51d02cff793f77.tar.zst nixlib-cfed953b5f304164a66d42e55f51d02cff793f77.zip | |
* Option to enable the Intel 3945 firmware. (It's enabled by
default since it doesn't seem to have the legal issues of the Intel 2200 firmware.) * Firmware loader: don't write in /tmp. Also a hack to quickly test new firmwares. * Revert r10105 since the build fails if configuration.nix is a symlink. Anyway copying configuration.nix does not necessarily make sense since it can import other expressions, which would also have to be copied. Perhaps a better approach would be to write a serialisation of the config to a file (maybe with builtins.toXML). svn path=/nixos/trunk/; revision=10127
Diffstat (limited to 'default.nix')
| -rw-r--r-- | default.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/default.nix b/default.nix index 481202b75caf..09c9a1569d88 100644 --- a/default.nix +++ b/default.nix @@ -4,8 +4,7 @@ let let env = builtins.getEnv "NIXOS_CONFIG"; in if env == "" then /etc/nixos/configuration.nix else env; - system = import system/system.nix {configuration = import configFileName; - inherit configFileName; }; + system = import system/system.nix {configuration = import configFileName;}; in |