diff options
| author | Adam Joseph <adam@westernsemico.com> | 2023-04-07 00:16:36 -0700 |
|---|---|---|
| committer | Adam Joseph <adam@westernsemico.com> | 2023-07-05 03:32:15 -0700 |
| commit | 758bf4cb8a7cf53eb0695e7bc28fc7f8820b2489 (patch) | |
| tree | 60065b38a2029871053d9d9b4fdee1244ecea400 | |
| parent | 84ada07d731fc43c854d38220e59556d4bddb5af (diff) | |
| download | nixpkgs-758bf4cb8a7cf53eb0695e7bc28fc7f8820b2489.tar nixpkgs-758bf4cb8a7cf53eb0695e7bc28fc7f8820b2489.tar.gz nixpkgs-758bf4cb8a7cf53eb0695e7bc28fc7f8820b2489.tar.bz2 nixpkgs-758bf4cb8a7cf53eb0695e7bc28fc7f8820b2489.tar.lz nixpkgs-758bf4cb8a7cf53eb0695e7bc28fc7f8820b2489.tar.xz nixpkgs-758bf4cb8a7cf53eb0695e7bc28fc7f8820b2489.tar.zst nixpkgs-758bf4cb8a7cf53eb0695e7bc28fc7f8820b2489.zip | |
chromium: 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.
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/common.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/default.nix | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 36e25939962..4cd7eb485bc 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -139,7 +139,10 @@ let bzip2 flac speex opusWithCustomModes libevent expat libjpeg snappy libcap - xdg-utils minizip libwebp + ] ++ lib.optionals (!xdg-utils.meta.broken) [ + xdg-utils + ] ++ [ + minizip libwebp libusb1 re2 ffmpeg libxslt libxml2 nasm @@ -225,6 +228,7 @@ let '/usr/share/locale/' \ '${glibc}/share/locale/' + '' + lib.optionalString (!xdg-utils.meta.broken) '' sed -i -e 's@"\(#!\)\?.*xdg-@"\1${xdg-utils}/bin/xdg-@' \ chrome/browser/shell_integration_linux.cc diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 3b4826930ec..5e65f7f817c 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -213,8 +213,10 @@ in stdenv.mkDerivation { export XDG_DATA_DIRS=$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH\''${XDG_DATA_DIRS:+:}\$XDG_DATA_DIRS + '' + lib.optionalString (!xdg-utils.meta.broken) '' # Mainly for xdg-open but also other xdg-* tools (this is only a fallback; \$PATH is suffixed so that other implementations can be used): export PATH="\$PATH\''${PATH:+:}${xdg-utils}/bin" + '' + '' . w |