From 5dcf14e5cd3ac05767326522f64abdffbf26074e Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 22 Sep 2018 05:17:36 +0200 Subject: pkgs/sandbox: Add dependency on Boost We're not directly using Boost but some headers are included in the headers we use, which causes the build to fail on newer Nix versions. In theory, this should be propagated by the Nix derivation. See also this comment: https://github.com/NixOS/nixpkgs/issues/39001#issuecomment-381949306 However, when looking at the Nix derivation, it already contains code that takes care of not propagating the boost dependency. Nevertheless, adding the dependency on our end even though it could become redundant some day certainly won't hurt. Signed-off-by: aszlig --- pkgs/build-support/build-sandbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/build-support') diff --git a/pkgs/build-support/build-sandbox/default.nix b/pkgs/build-support/build-sandbox/default.nix index a52be5c9..4265d30d 100644 --- a/pkgs/build-support/build-sandbox/default.nix +++ b/pkgs/build-support/build-sandbox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, pkgconfig, nix }: +{ stdenv, lib, pkgconfig, nix, boost }: drv: { paths ? {}, ... }@attrs: @@ -78,7 +78,7 @@ in stdenv.mkDerivation ({ ''; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ nix ]; + buildInputs = [ nix boost ]; makeFlags = [ "BINDIR=${drv}/bin" ]; } // removeAttrs attrs [ "paths" ]) -- cgit 1.4.1