From c69a216eec2f8f3ae1ddbaf051666d7eff424440 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Mon, 29 Apr 2024 22:23:59 +0200 Subject: [PATCH 1/2] {tor,mullvad}-browser: fix font config patch --- .../networking/browsers/mullvad-browser/default.nix | 2 +- pkgs/applications/networking/browsers/tor-browser/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/mullvad-browser/default.nix b/pkgs/applications/networking/browsers/mullvad-browser/default.nix index 9edb3d882acb..f89299d20a6a 100644 --- a/pkgs/applications/networking/browsers/mullvad-browser/default.nix +++ b/pkgs/applications/networking/browsers/mullvad-browser/default.nix @@ -209,7 +209,7 @@ stdenv.mkDerivation rec { # indicates the system fonts.conf being used instead. FONTCONFIG_FILE=$MB_IN_STORE/fontconfig/fonts.conf sed -i "$FONTCONFIG_FILE" \ - -e "s,fonts,$MB_IN_STORE/fonts," + -e "s,fonts,$MB_IN_STORE/fonts," 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 851f2c49f280..487a6a8e47c6 100644 --- a/pkgs/applications/networking/browsers/tor-browser/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser/default.nix @@ -264,7 +264,7 @@ stdenv.mkDerivation rec { # indicates the system fonts.conf being used instead. FONTCONFIG_FILE=$TBB_IN_STORE/fontconfig/fonts.conf sed -i "$FONTCONFIG_FILE" \ - -e "s,fonts,$TBB_IN_STORE/fonts," + -e "s,fonts,$TBB_IN_STORE/fonts," # 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 From f00481192ddbf75ada1ee02b324485104d1280c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Tue, 30 Apr 2024 19:40:52 +0200 Subject: [PATCH 2/2] {tor,mullvad}-browser: replace some sed commands with substituteInPlace The new substituteInPlace commands will fail when they don't apply, which will avoid some issues. --- .../networking/browsers/mullvad-browser/default.nix | 4 ++-- .../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 f89299d20a6a..a34b5022a7a3 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,fonts,$MB_IN_STORE/fonts," + substituteInPlace "$FONTCONFIG_FILE" \ + --replace-fail 'fonts' "$MB_IN_STORE/fonts" 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 487a6a8e47c6..91456e85e6f7 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,fonts,$TBB_IN_STORE/fonts," + substituteInPlace "$FONTCONFIG_FILE" \ + --replace-fail 'fonts' "$TBB_IN_STORE/fonts" # 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