diff --git a/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix b/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix index 6dfbaae3e5de..4eeb3b0f169c 100644 --- a/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix +++ b/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix @@ -12,6 +12,7 @@ , targetPkgs ? pkgs: [] , multiPkgs ? pkgs: [] , multiArch ? false # Whether to include 32bit packages +, nativeBuildInputs ? [] , extraBuildCommands ? "" , extraBuildCommandsMulti ? "" , extraOutputsToInstall ? [] @@ -257,6 +258,7 @@ let ''; in runCommandLocal "${name}-fhs" { + inherit nativeBuildInputs; passthru = { inherit args baseTargetPaths targetPaths baseMultiPaths ldconfig isMultiBuild; }; diff --git a/pkgs/build-support/build-fhsenv-bubblewrap/default.nix b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix index 398a99e80e8c..99faeb7eb01a 100644 --- a/pkgs/build-support/build-fhsenv-bubblewrap/default.nix +++ b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix @@ -10,6 +10,7 @@ }: { runScript ? "bash" +, nativeBuildInputs ? [] , extraInstallCommands ? "" , meta ? {} , passthru ? {} @@ -270,7 +271,7 @@ let bin = writeShellScript "${name}-bwrap" (bwrapCmd { initArgs = ''"$@"''; }); in runCommandLocal name (nameAttrs // { - inherit meta; + inherit nativeBuildInputs meta; passthru = passthru // { env = runCommandLocal "${name}-shell-env" { diff --git a/pkgs/build-support/build-fhsenv-chroot/default.nix b/pkgs/build-support/build-fhsenv-chroot/default.nix index 6f0adfb4e08c..b1d9630ae8f9 100644 --- a/pkgs/build-support/build-fhsenv-chroot/default.nix +++ b/pkgs/build-support/build-fhsenv-chroot/default.nix @@ -2,7 +2,7 @@ let buildFHSEnv = callPackage ./env.nix { }; in -args@{ name, version ? null, runScript ? "bash", extraInstallCommands ? "", meta ? {}, passthru ? {}, ... }: +args@{ name, version ? null, runScript ? "bash", nativeBuildInputs ? [], extraInstallCommands ? "", meta ? {}, passthru ? {}, ... }: let env = buildFHSEnv (removeAttrs args [ "version" "runScript" "extraInstallCommands" "meta" "passthru" ]); @@ -28,7 +28,7 @@ let nameAndVersion = name + versionStr; in runCommandLocal nameAndVersion { - inherit meta; + inherit nativeBuildInputs meta; passthru = passthru // { env = runCommandLocal "${name}-shell-env" { diff --git a/pkgs/build-support/build-fhsenv-chroot/env.nix b/pkgs/build-support/build-fhsenv-chroot/env.nix index 6a82435d7067..105e2975f433 100644 --- a/pkgs/build-support/build-fhsenv-chroot/env.nix +++ b/pkgs/build-support/build-fhsenv-chroot/env.nix @@ -4,6 +4,7 @@ , profile ? "" , targetPkgs ? pkgs: [] , multiPkgs ? pkgs: [] +, nativeBuildInputs ? [] , extraBuildCommands ? "" , extraBuildCommandsMulti ? "" , extraOutputsToInstall ? [] @@ -245,6 +246,7 @@ let in stdenv.mkDerivation { name = "${name}-fhs"; + inherit nativeBuildInputs; buildCommand = '' mkdir -p $out cd $out