From f6c5e4c27352c349ee4d45d7f6ca0cdf02f90deb Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Fri, 7 Apr 2023 00:17:40 -0700 Subject: [PATCH] firefox: late-bind xdg-utils if broken xdg-utils does not cross-compile. Let's late-bind (using the runtime $PATH) in this scenario so a native-built xdg-utils can be used instead. --- pkgs/applications/networking/browsers/firefox/wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 1e8240d6800e..8c0dcb81019b 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -303,7 +303,7 @@ let "''${executablePath}${nameSuffix}" \ --prefix LD_LIBRARY_PATH ':' "$libs" \ --suffix-each GTK_PATH ':' "$gtk_modules" \ - --suffix PATH ':' "${xdg-utils}/bin" \ + ${lib.optionalString (!xdg-utils.meta.broken) "--suffix PATH ':' \"${xdg-utils}/bin\""} \ --suffix PATH ':' "$out/bin" \ --set MOZ_APP_LAUNCHER "${launcherName}" \ --set MOZ_SYSTEM_DIR "$out/lib/mozilla" \