some: put NIX_CFLAGS_COMPILE under env to fix withCFlags (#439203)

Sandro 19a8f12a 10a29bad

Changed files
+11 -9
pkgs
by-name
sc
screen
development
interpreters
python
+1 -1
pkgs/by-name/sc/screen/package.nix
···
];
# We need _GNU_SOURCE so that mallocmock_reset() is defined: https://savannah.gnu.org/bugs/?66416
-
NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE=1 -Wno-int-conversion -Wno-incompatible-pointer-types";
nativeBuildInputs = [
autoreconfHook
···
];
# We need _GNU_SOURCE so that mallocmock_reset() is defined: https://savannah.gnu.org/bugs/?66416
+
env.NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE=1 -Wno-int-conversion -Wno-incompatible-pointer-types";
nativeBuildInputs = [
autoreconfHook
+10 -8
pkgs/development/interpreters/python/pypy/default.nix
···
dontPatchShebangs = true;
disallowedReferences = [ python ];
-
# fix compiler error in curses cffi module, where char* != const char*
-
NIX_CFLAGS_COMPILE =
-
if stdenv.cc.isClang then "-Wno-error=incompatible-function-pointer-types" else null;
-
C_INCLUDE_PATH = lib.makeSearchPathOutput "dev" "include" buildInputs;
-
LIBRARY_PATH = lib.makeLibraryPath buildInputs;
-
LD_LIBRARY_PATH = lib.makeLibraryPath (
-
builtins.filter (x: x.outPath != stdenv.cc.libc.outPath or "") buildInputs
-
);
patches = [
./dont_fetch_vendored_deps.patch
···
dontPatchShebangs = true;
disallowedReferences = [ python ];
+
env = {
+
# fix compiler error in curses cffi module, where char* != const char*
+
NIX_CFLAGS_COMPILE =
+
if stdenv.cc.isClang then "-Wno-error=incompatible-function-pointer-types" else null;
+
C_INCLUDE_PATH = lib.makeSearchPathOutput "dev" "include" buildInputs;
+
LIBRARY_PATH = lib.makeLibraryPath buildInputs;
+
LD_LIBRARY_PATH = lib.makeLibraryPath (
+
builtins.filter (x: x.outPath != stdenv.cc.libc.outPath or "") buildInputs
+
);
+
};
patches = [
./dont_fetch_vendored_deps.patch