diff options
| author | Atemu <atemu.main@gmail.com> | 2023-05-21 12:43:19 +0200 |
|---|---|---|
| committer | Anderson Torres <torres.anderson.85@protonmail.com> | 2023-05-22 11:34:04 -0300 |
| commit | d5f0da152a8245169e85823f67543e1851c82490 (patch) | |
| tree | 42db5086f4a168752ab56207518de97cfc199f93 /pkgs | |
| parent | 344ab3d68872c8816202f133de5ae830df150e0d (diff) | |
Revert "Merge pull request #230693 from Atemu/fix/fhsenv-escape-runScript-path"
This reverts commit 840f2e0ac566862d93aff6721351fc09977c1f54, reversing changes made to d3ed0402e50852342ec06edfe4bd23f597d5ae2a. This breaks appimage which puts args into the runScript and we don't provide a good way to pass thru additional args. The actual bug was in nix-alien which should escape paths; providing a valid runScript is the responsibility of the caller.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/build-support/build-fhsenv-bubblewrap/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/build-fhsenv-bubblewrap/default.nix b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix index fb45598759174..6c9b71624c2bb 100644 --- a/pkgs/build-support/build-fhsenv-bubblewrap/default.nix +++ b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix @@ -111,7 +111,7 @@ let init = run: writeShellScript "${name}-init" '' source /etc/profile ${createLdConfCache} - exec ${lib.escapeShellArg run} "$@" + exec ${run} "$@" ''; indentLines = str: lib.concatLines (map (s: " " + s) (filter (s: s != "") (lib.splitString "\n" str))); |