Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nix
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7c74f075f4a7
Choose a base ref
...
head repository: NixOS/nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 08ad9714e182
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 9, 2019

  1. Handle empty sandbox_shell 

    Previously, SANDBOX_SHELL was set to empty when unavailable. This
caused issues when actually generating the sandbox. Instead, just set
SANDBOX_SHELL when --with-sandbox-shell= is non-empty. Alternative
implementation to #3038.
    @matthewbauer
    matthewbauer committed Oct 9, 2019
    Copy the full SHA
    199e888 View commit details

  2. Merge pull request #3132 from matthewbauer/handle-sandbox-shell 

    Handle empty sandbox_shell
    @edolstra
    edolstra authored Oct 9, 2019
    Copy the full SHA
    08ad971 View commit details
Showing with 4 additions and 1 deletion.
  1. +4 −1 src/libstore/local.mk
5 changes: 4 additions & 1 deletion src/libstore/local.mk
View file
Original file line number Diff line number Diff line change
@@ -39,9 +39,12 @@ libstore_CXXFLAGS = \
-DNIX_LIBEXEC_DIR=\"$(libexecdir)\" \
-DNIX_BIN_DIR=\"$(bindir)\" \
-DNIX_MAN_DIR=\"$(mandir)\" \
-DSANDBOX_SHELL="\"$(sandbox_shell)\"" \
-DLSOF=\"$(lsof)\"

ifneq ($(sandbox_shell),)
libstore_CXXFLAGS += -DSANDBOX_SHELL="\"$(sandbox_shell)\""
endif

$(d)/local-store.cc: $(d)/schema.sql.gen.hh

$(d)/build.cc: