Unverified Commit 19a8f12a authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

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

parents 10a29bad f5347e9d

pkgs/by-name/sc/screen/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec { 
  ];



  # 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";

  env.NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE=1 -Wno-int-conversion -Wno-incompatible-pointer-types";



  nativeBuildInputs = [

    autoreconfHook

pkgs/development/interpreters/python/pypy/default.nix

+10 −8
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ stdenv.mkDerivation rec { 
  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;
@@ -128,6 +129,7 @@ stdenv.mkDerivation rec { 
    LD_LIBRARY_PATH = lib.makeLibraryPath (

      builtins.filter (x: x.outPath != stdenv.cc.libc.outPath or "") buildInputs

    );

  };



  patches = [

    ./dont_fetch_vendored_deps.patch