From 44c06fcc9fbaafd8a01e5fd70421e03368eb0da6 Mon Sep 17 00:00:00 2001 From: Yureka Date: Sat, 14 Dec 2024 20:22:09 +0100 Subject: [PATCH] buildMozillaMach: elf-hack is only available on elf platforms Followup to https://github.com/NixOS/nixpkgs/pull/365185 Probably darwin does not have the elf-hack options, so restrict it to platforms which have Elf. Change-Id: I2d585721ca08df57a7d2d55bb5a727d34b3fb216 --- pkgs/applications/networking/browsers/firefox/common.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 34b4e82d59d0..dba2d1edaa7e 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -28,7 +28,8 @@ let # Specifying --(dis|en)able-elf-hack on a platform for which it's not implemented will give `--disable-elf-hack is not available in this configuration` # This is declared here because it's used in the default value of elfhackSupport - isElfhackPlatform = stdenv: stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64; + isElfhackPlatform = stdenv: stdenv.hostPlatform.isElf && + (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64); in { lib