diff options
author | Jan Nieuwenhuizen <janneke@gnu.org> | 2018-10-21 23:18:19 +0200 |
---|---|---|
committer | Jan Nieuwenhuizen <janneke@gnu.org> | 2018-10-21 23:19:35 +0200 |
commit | cf7658f7cb5de0e17f4801faa84c378a4b40033e (patch) | |
tree | 646fa120d67bb41868a543461700e62aa170b2c0 /nix/libstore/builtins.cc | |
parent | 09c5a5680a06011f985a84aa26fb890b3be453bd (diff) | |
parent | ffddb42d6c510456997ee6de1c1b8026c9ce6d14 (diff) |
Merge branch 'core-updates' into core-updates-next
Diffstat (limited to 'nix/libstore/builtins.cc')
-rw-r--r-- | nix/libstore/builtins.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/nix/libstore/builtins.cc b/nix/libstore/builtins.cc index a5ebb47737..1f52511c80 100644 --- a/nix/libstore/builtins.cc +++ b/nix/libstore/builtins.cc @@ -1,5 +1,5 @@ /* GNU Guix --- Functional package management for GNU - Copyright (C) 2016, 2017 Ludovic Courtès <ludo@gnu.org> + Copyright (C) 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org> This file is part of GNU Guix. @@ -47,6 +47,9 @@ static void builtinDownload(const Derivation &drv, content-addressed mirrors) works correctly. */ setenv("NIX_STORE", settings.nixStore.c_str(), 1); + /* Tell it about options such as "print-extended-build-trace". */ + setenv("_NIX_OPTIONS", settings.pack().c_str(), 1); + /* XXX: Hack our way to use the 'download' script from 'LIBEXECDIR/guix' or just 'LIBEXECDIR', depending on whether we're running uninstalled or not. */ |