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/r-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/r-modules')
| -rw-r--r-- | pkgs/development/r-modules/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/r-modules/generic-builder.nix | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index f287605aa8f2..78493c742010 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -975,12 +975,12 @@ let }); data_table = old.data_table.overrideDerivation (attrs: { - NIX_CFLAGS_COMPILE = attrs.NIX_CFLAGS_COMPILE + " -fopenmp"; + env.NIX_CFLAGS_COMPILE = attrs.NIX_CFLAGS_COMPILE + " -fopenmp"; patchPhase = "patchShebangs configure"; }); ModelMetrics = old.ModelMetrics.overrideDerivation (attrs: { - NIX_CFLAGS_COMPILE = attrs.NIX_CFLAGS_COMPILE + env.NIX_CFLAGS_COMPILE = attrs.NIX_CFLAGS_COMPILE + lib.optionalString stdenv.isDarwin " -fopenmp"; }); @@ -1184,7 +1184,7 @@ let }); rstan = old.rstan.overrideDerivation (attrs: { - NIX_CFLAGS_COMPILE = "${attrs.NIX_CFLAGS_COMPILE} -DBOOST_PHOENIX_NO_VARIADIC_EXPRESSION"; + env.NIX_CFLAGS_COMPILE = "${attrs.NIX_CFLAGS_COMPILE} -DBOOST_PHOENIX_NO_VARIADIC_EXPRESSION"; }); mongolite = old.mongolite.overrideDerivation (attrs: { diff --git a/pkgs/development/r-modules/generic-builder.nix b/pkgs/development/r-modules/generic-builder.nix index 05c069383e78..5939a425aefa 100644 --- a/pkgs/development/r-modules/generic-builder.nix +++ b/pkgs/development/r-modules/generic-builder.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation ({ lib.optionals requireX [util-linux xvfb-run] ++ lib.optionals stdenv.isDarwin [Cocoa Foundation gfortran libiconv]; - NIX_CFLAGS_COMPILE = + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; configurePhase = '' |