From 24b26ce79ead1ef985b04ac6f2947a369a68f75e Mon Sep 17 00:00:00 2001 From: Joerie de Gram Date: Wed, 29 Dec 2021 15:34:37 +0100 Subject: [PATCH] spidermonkey_91: fix cross compilation The configurePlatforms mkDerivation parameter needs to be an empty list to avoid bogus defaults from breaking cross compilation. Document the parameter to prevent it from being cleaned up. --- pkgs/development/interpreters/spidermonkey/68.nix | 2 ++ pkgs/development/interpreters/spidermonkey/78.nix | 2 ++ pkgs/development/interpreters/spidermonkey/91.nix | 4 ++++ 3 files changed, 8 insertions(+) diff --git a/pkgs/development/interpreters/spidermonkey/68.nix b/pkgs/development/interpreters/spidermonkey/68.nix index 5cfb2de919f1..a71805f50563 100644 --- a/pkgs/development/interpreters/spidermonkey/68.nix +++ b/pkgs/development/interpreters/spidermonkey/68.nix @@ -78,6 +78,8 @@ in stdenv.mkDerivation rec { "--target=${stdenv.hostPlatform.config}" ]; + # mkDerivation by default appends --build/--host to configureFlags when cross compiling + # These defaults are bogus for Spidermonkey - avoid passing them by providing an empty list configurePlatforms = []; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/development/interpreters/spidermonkey/78.nix b/pkgs/development/interpreters/spidermonkey/78.nix index cd745c5ba9e0..b4ed171eb78c 100644 --- a/pkgs/development/interpreters/spidermonkey/78.nix +++ b/pkgs/development/interpreters/spidermonkey/78.nix @@ -92,6 +92,8 @@ stdenv.mkDerivation rec { "--target=${stdenv.hostPlatform.config}" ]; + # mkDerivation by default appends --build/--host to configureFlags when cross compiling + # These defaults are bogus for Spidermonkey - avoid passing them by providing an empty list configurePlatforms = [ ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/development/interpreters/spidermonkey/91.nix b/pkgs/development/interpreters/spidermonkey/91.nix index a8927e79f9a4..57e62e319d11 100644 --- a/pkgs/development/interpreters/spidermonkey/91.nix +++ b/pkgs/development/interpreters/spidermonkey/91.nix @@ -88,6 +88,10 @@ stdenv.mkDerivation rec { "--target=${stdenv.hostPlatform.config}" ]; + # mkDerivation by default appends --build/--host to configureFlags when cross compiling + # These defaults are bogus for Spidermonkey - avoid passing them by providing an empty list + configurePlatforms = [ ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; # Remove unnecessary static lib