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/ruby-modules | |
| 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/ruby-modules')
| -rw-r--r-- | pkgs/development/ruby-modules/gem-config/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/ruby-modules/gem/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 06516ab2fba9b..be6a03513eca0 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -323,7 +323,7 @@ in nativeBuildInputs = [ pkg-config ] ++ lib.optional stdenv.isDarwin cctools; buildInputs = [ openssl ]; hardeningDisable = [ "format" ]; - NIX_CFLAGS_COMPILE = toString [ + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=stringop-overflow" "-Wno-error=implicit-fallthrough" "-Wno-error=sizeof-pointer-memaccess" diff --git a/pkgs/development/ruby-modules/gem/default.nix b/pkgs/development/ruby-modules/gem/default.nix index dbb9e4f451cc4..d3a936040951a 100644 --- a/pkgs/development/ruby-modules/gem/default.nix +++ b/pkgs/development/ruby-modules/gem/default.nix @@ -136,7 +136,7 @@ stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // { # As of ruby 3.0, ruby headers require -fdeclspec when building with clang # Introduced in https://github.com/ruby/ruby/commit/0958e19ffb047781fe1506760c7cbd8d7fe74e57 - NIX_CFLAGS_COMPILE = lib.optionals (stdenv.cc.isClang && lib.versionAtLeast ruby.version.major "3") [ + env.NIX_CFLAGS_COMPILE = lib.optionals (stdenv.cc.isClang && lib.versionAtLeast ruby.version.major "3") [ "-fdeclspec" ]; |