nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-12-06 00:51:00 +01:00
Code Activity

Fix static build

Browse source
This commit is contained in:
John Ericson 2024-06-28 14:26:04 -04:00
parent 874ff000d4
commit f7ce10dbc1
3 changed files with 21 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/libstore/package.nix
View file

@ -5,6 +5,7 @@
, meson
, ninja
, pkg-config
, unixtools
, nix-util
, boost
@ -20,6 +21,8 @@
, versionSuffix ? ""
, embeddedSandboxShell ? stdenv.hostPlatform.isStatic
# Check test coverage of Nix. Probably want to use with at least
# one of `doCheck` or `doInstallCheck` enabled.
, withCoverageChecks ? false
@ -66,7 +69,7 @@ mkDerivation (finalAttrs: {
meson
ninja
pkg-config
];
] ++ lib.optional embeddedSandboxShell unixtools.hexdump;
buildInputs = [
boost
@ -96,7 +99,7 @@ mkDerivation (finalAttrs: {
mesonFlags = [
(lib.mesonEnable "seccomp-sandboxing" stdenv.hostPlatform.isLinux)
(lib.mesonBool "embedded-sandbox-shell" stdenv.hostPlatform.isStatic)
(lib.mesonBool "embedded-sandbox-shell" embeddedSandboxShell)
] ++ lib.optionals stdenv.hostPlatform.isLinux [
(lib.mesonOption "sandbox-shell" "${busybox-sandbox-shell}/bin/busybox")
];