From c71ffb21a9d0adcf785c5bd3a0bd69bd0a650b57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 16 Sep 2025 00:38:34 +0200 Subject: [PATCH] pypy: fix eval --- .../interpreters/python/pypy/default.nix | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix index fa97386d68ce..5f4f0d537e0a 100644 --- a/pkgs/development/interpreters/python/pypy/default.nix +++ b/pkgs/development/interpreters/python/pypy/default.nix @@ -120,16 +120,18 @@ 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; - 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 - ); - }; + env = + lib.optionalAttrs stdenv.cc.isClang { + # fix compiler error in curses cffi module, where char* != const char* + NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-function-pointer-types"; + } + // { + 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