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/libraries/clucene-core | |
parent | 6f6cc4a22db345c66bcb69c26469b0140ca3be44 (diff) | |
download | nixpkgs-f9fdf2d4028eac28a074c9ad75d309b3dcbf8e7a.tar nixpkgs-f9fdf2d4028eac28a074c9ad75d309b3dcbf8e7a.tar.gz nixpkgs-f9fdf2d4028eac28a074c9ad75d309b3dcbf8e7a.tar.bz2 nixpkgs-f9fdf2d4028eac28a074c9ad75d309b3dcbf8e7a.tar.lz nixpkgs-f9fdf2d4028eac28a074c9ad75d309b3dcbf8e7a.tar.xz nixpkgs-f9fdf2d4028eac28a074c9ad75d309b3dcbf8e7a.tar.zst nixpkgs-f9fdf2d4028eac28a074c9ad75d309b3dcbf8e7a.zip |
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/libraries/clucene-core')
-rw-r--r-- | pkgs/development/libraries/clucene-core/2.x.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/clucene-core/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/clucene-core/2.x.nix b/pkgs/development/libraries/clucene-core/2.x.nix index 538c4ceb4f5..18d055a387a 100644 --- a/pkgs/development/libraries/clucene-core/2.x.nix +++ b/pkgs/development/libraries/clucene-core/2.x.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { # /build/clucene-core-2.3.3.4/build/bin/cl_test" doCheck = false; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; meta = with lib; { description = "Core library for full-featured text search engine"; diff --git a/pkgs/development/libraries/clucene-core/default.nix b/pkgs/development/libraries/clucene-core/default.nix index 59b5db69b63..b6765af12a4 100644 --- a/pkgs/development/libraries/clucene-core/default.nix +++ b/pkgs/development/libraries/clucene-core/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { patches = [ ./gcc6.patch ]; - NIX_CFLAGS_COMPILE = toString [ + env.NIX_CFLAGS_COMPILE = toString [ "-std=c++11" ]; |