diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-05-01 12:01:23 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-01 12:01:23 +0000 |
| commit | 992b6af1a405b218a2cf38bf912a7849e080d460 (patch) | |
| tree | 39ecaf7190e5148240ffdafec74458e8a44a5d81 /pkgs/applications/networking/browsers | |
| parent | 41126a9493dced3c29ffca51b7bcad9bc8123251 (diff) | |
| parent | 8a23e9931979fe31b76de903816b018da575f6e4 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/networking/browsers')
| -rw-r--r-- | pkgs/applications/networking/browsers/mullvad-browser/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/networking/browsers/tor-browser/default.nix | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/networking/browsers/mullvad-browser/default.nix b/pkgs/applications/networking/browsers/mullvad-browser/default.nix index d4a6b593f0646..580bee84b70ea 100644 --- a/pkgs/applications/networking/browsers/mullvad-browser/default.nix +++ b/pkgs/applications/networking/browsers/mullvad-browser/default.nix @@ -208,8 +208,8 @@ stdenv.mkDerivation rec { # fonts.conf; upstream uses FONTCONFIG_PATH, but FC_DEBUG=1024 # indicates the system fonts.conf being used instead. FONTCONFIG_FILE=$MB_IN_STORE/fontconfig/fonts.conf - sed -i "$FONTCONFIG_FILE" \ - -e "s,<dir>fonts</dir>,<dir>$MB_IN_STORE/fonts</dir>," + substituteInPlace "$FONTCONFIG_FILE" \ + --replace-fail '<dir prefix="cwd">fonts</dir>' "<dir>$MB_IN_STORE/fonts</dir>" mkdir -p $out/bin diff --git a/pkgs/applications/networking/browsers/tor-browser/default.nix b/pkgs/applications/networking/browsers/tor-browser/default.nix index 9a922c4572ee2..7ab20a22b8d7a 100644 --- a/pkgs/applications/networking/browsers/tor-browser/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser/default.nix @@ -199,8 +199,8 @@ stdenv.mkDerivation rec { ''} # Fixup paths to pluggable transports. - sed -i TorBrowser/Data/Tor/torrc-defaults \ - -e "s,./TorBrowser,$TBB_IN_STORE/TorBrowser,g" + substituteInPlace TorBrowser/Data/Tor/torrc-defaults \ + --replace-fail './TorBrowser' "$TBB_IN_STORE/TorBrowser" # Fixup obfs transport. Work around patchelf failing to set # interpreter for pre-compiled Go binaries by invoking the interpreter @@ -263,8 +263,8 @@ stdenv.mkDerivation rec { # fonts.conf; upstream uses FONTCONFIG_PATH, but FC_DEBUG=1024 # indicates the system fonts.conf being used instead. FONTCONFIG_FILE=$TBB_IN_STORE/fontconfig/fonts.conf - sed -i "$FONTCONFIG_FILE" \ - -e "s,<dir>fonts</dir>,<dir>$TBB_IN_STORE/fonts</dir>," + substituteInPlace "$FONTCONFIG_FILE" \ + --replace-fail '<dir prefix="cwd">fonts</dir>' "<dir>$TBB_IN_STORE/fonts</dir>" # Hard-code paths to geoip data files. TBB resolves the geoip files # relative to torrc-defaults_path but if we do not hard-code them |