diff options
author | Atemu <atemu.main@gmail.com> | 2023-03-28 17:25:14 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-28 17:25:14 +0200 |
commit | 91f5aa3446667aef9736d760b3c3229f696253c2 (patch) | |
tree | ccbf51b4f89d2c42168397ab19f334800f11a0fe /pkgs/build-support/build-fhs-userenv-bubblewrap | |
parent | 2e0bb26204da57996bfb25be3725ff51c65c5f60 (diff) | |
parent | 1f27e0b77a63fd243ab40dfce22edf106424faea (diff) |
Merge pull request #213378 from Atemu/steam-env-vars
steam: add extraEnv argument
Diffstat (limited to 'pkgs/build-support/build-fhs-userenv-bubblewrap')
-rw-r--r-- | pkgs/build-support/build-fhs-userenv-bubblewrap/buildFHSEnv.nix (renamed from pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix) | 6 | ||||
-rw-r--r-- | pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix | 11 |
2 files changed, 11 insertions, 6 deletions
diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/buildFHSEnv.nix index c4d967a11c699..0d98c0a2bc645 100644 --- a/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix +++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/buildFHSEnv.nix @@ -1,6 +1,6 @@ { stdenv, lib, buildEnv, writeText, writeShellScriptBin, pkgs, pkgsi686Linux }: -{ name, profile ? "" +args@{ name, profile ? "" , targetPkgs ? pkgs: [], multiPkgs ? pkgs: [] , extraBuildCommands ? "", extraBuildCommandsMulti ? "" , extraOutputsToInstall ? [] @@ -216,4 +216,8 @@ in stdenv.mkDerivation { ''; preferLocalBuild = true; allowSubstitutes = false; + + passthru = { + inherit args multiPaths targetPaths; + }; } diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix index 74a22566d51c4..ce807b932a197 100644 --- a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix +++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix @@ -20,9 +20,9 @@ args @ { with builtins; let - buildFHSEnv = callPackage ./env.nix { }; + buildFHSEnv = callPackage ./buildFHSEnv.nix { }; - env = buildFHSEnv (removeAttrs args [ + fhsenv = buildFHSEnv (removeAttrs args [ "runScript" "extraInstallCommands" "meta" "passthru" "extraBwrapArgs" "dieWithParent" "unshareUser" "unshareCgroup" "unshareUts" "unshareNet" "unsharePid" "unshareIpc" "version" @@ -104,7 +104,7 @@ let ro_mounts=() symlinks=() etc_ignored=() - for i in ${env}/*; do + for i in ${fhsenv}/*; do path="/''${i##*/}" if [[ $path == '/etc' ]]; then : @@ -117,8 +117,8 @@ let fi done - if [[ -d ${env}/etc ]]; then - for i in ${env}/etc/*; do + if [[ -d ${fhsenv}/etc ]]; then + for i in ${fhsenv}/etc/*; do path="/''${i##*/}" # NOTE: we're binding /etc/fonts and /etc/ssl/certs from the host so we # don't want to override it with a path from the FHS environment. @@ -221,6 +221,7 @@ in runCommandLocal nameAndVersion { echo >&2 "" exit 1 ''; + inherit args fhsenv; }; } '' mkdir -p $out/bin |