diff options
| author | Nick Cao <nickcao@nichi.co> | 2024-05-02 09:15:29 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-02 09:15:29 -0400 |
| commit | b018c29aad6af8c9927ec860299d08a590303b46 (patch) | |
| tree | b4d43d7ab707191ecea17436e3a08475e02d00d1 | |
| parent | 96df7cca522887b3880bc83e79ca62d0f08874ae (diff) | |
| parent | d3ddcfae3fa772043daacffd838052e8f95932b4 (diff) | |
Merge pull request #308226 from NixOS/backport-307832-to-release-23.11
[Backport release-23.11] {tor,mullvad}-browser: fix font config patch| -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 5fb0bc61b8aa..172ef5a3958f 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 9b36252dfc97..fb4ab4942cb6 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 |