diff options
author | Artturin <Artturin@artturin.com> | 2023-02-19 21:23:32 +0200 |
---|---|---|
committer | Artturin <Artturin@artturin.com> | 2023-02-22 21:23:04 +0200 |
commit | f9fdf2d4028eac28a074c9ad75d309b3dcbf8e7a (patch) | |
tree | 01a46081dd6fc9d0a4c68be1c1844a8764bd8461 /pkgs/development/interpreters/spidermonkey | |
parent | 6f6cc4a22db345c66bcb69c26469b0140ca3be44 (diff) |
treewide: move NIX_CFLAGS_COMPILE to the env attrset
with structuredAttrs lists will be bash arrays which cannot be exported
which will be a issue with some patches and some wrappers like cc-wrapper
this makes it clearer that NIX_CFLAGS_COMPILE must be a string as lists
in env cause a eval failure
Diffstat (limited to 'pkgs/development/interpreters/spidermonkey')
-rw-r--r-- | pkgs/development/interpreters/spidermonkey/common.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/interpreters/spidermonkey/common.nix b/pkgs/development/interpreters/spidermonkey/common.nix index a4310b8f206f..a6b0282ce5c1 100644 --- a/pkgs/development/interpreters/spidermonkey/common.nix +++ b/pkgs/development/interpreters/spidermonkey/common.nix @@ -134,7 +134,7 @@ stdenv.mkDerivation (finalAttrs: rec { # cc-rs insists on using -mabi=lp64 (soft-float) for riscv64, # while we have a double-float toolchain - NIX_CFLAGS_COMPILE = lib.optionalString (with stdenv.hostPlatform; isRiscV && is64bit && lib.versionOlder version "91") "-mabi=lp64d"; + env.NIX_CFLAGS_COMPILE = lib.optionalString (with stdenv.hostPlatform; isRiscV && is64bit && lib.versionOlder version "91") "-mabi=lp64d"; # https://github.com/NixOS/nixpkgs/issues/201254 NIX_LDFLAGS = if (with stdenv; isAarch64 && isLinux) then [ "-lgcc" ] else null; |