diff options
| author | aszlig <aszlig@nix.build> | 2022-02-09 23:10:41 +0100 |
|---|---|---|
| committer | aszlig <aszlig@nix.build> | 2022-02-09 23:12:56 +0100 |
| commit | 81a5c519413125001258fe0e25bbd5c458647f65 (patch) | |
| tree | a52a286a6577eff4ecd7c433decbb28f957463b8 /pkgs/build-support | |
| parent | 1f8d489b66fc976bfac38277d0966bbd25c0c6d5 (diff) | |
sandbox: Use Nix 2.3 for now
The way store paths are queried has changed significantly in Nix 2.4, so we need to completely refactor nix-query.cc. However, I currently have a lot of other things to do and the store protocol is compatible so let's pin Nix to version 2.3 for the sandbox implementation for now. Signed-off-by: aszlig <aszlig@nix.build>
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/build-sandbox/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/build-support/build-sandbox/default.nix b/pkgs/build-support/build-sandbox/default.nix index 3b42f4f3..09c1b3de 100644 --- a/pkgs/build-support/build-sandbox/default.nix +++ b/pkgs/build-support/build-sandbox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, pkg-config, closureInfo, nix, boost, dash }: +{ stdenv, lib, pkg-config, closureInfo, nix_2_3, boost, dash }: drv: { paths ? {}, ... }@attrs: @@ -98,7 +98,8 @@ in stdenv.mkDerivation ({ ''; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ boost nix ]; + # FIXME: Use current Nix after fixing API compatibility. + buildInputs = [ boost nix_2_3 ]; makeFlags = [ "BINDIR=${drv}/bin" "EXTRA_NS_FLAGS=${extraNamespaceFlags}" ] ++ lib.optional allowBinSh "BINSH_EXECUTABLE=${dash}/bin/dash" ++ lib.optional fullNixStore "FULL_NIX_STORE=1"; |