BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #152715 from ius/spidermonkey-cross

Browse source 
spidermonkey_91: fix cross compilation
This commit is contained in:
ajs124 2022-01-02 22:56:41 +01:00 committed by GitHub
commit d6425c9ee1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/interpreters/spidermonkey/68.nix
View file

@ -78,6 +78,8 @@ in stdenv.mkDerivation rec {
"--target=${stdenv.hostPlatform.config}" "--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 = []; configurePlatforms = [];
depsBuildBuild = [ buildPackages.stdenv.cc ]; depsBuildBuild = [ buildPackages.stdenv.cc ];

2
pkgs/development/interpreters/spidermonkey/78.nix
View file

@ -92,6 +92,8 @@ stdenv.mkDerivation rec {
"--target=${stdenv.hostPlatform.config}" "--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 = [ ]; configurePlatforms = [ ];
depsBuildBuild = [ buildPackages.stdenv.cc ]; depsBuildBuild = [ buildPackages.stdenv.cc ];

4
pkgs/development/interpreters/spidermonkey/91.nix
View file

@ -88,6 +88,10 @@ stdenv.mkDerivation rec {
"--target=${stdenv.hostPlatform.config}" "--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 ]; depsBuildBuild = [ buildPackages.stdenv.cc ];
# Remove unnecessary static lib # Remove unnecessary static lib