treewide: NIX_CFLAGS_COMPILE -> string

This commit is contained in:
Robin Gloster
2019-10-30 00:53:51 +01:00
committed by Jan Tojnar
parent 4db0860814
commit e5ded57aab
11 changed files with 21 additions and 24 deletions

View File

@@ -39,13 +39,13 @@ stdenv.mkDerivation rec {
--replace "-Xlinker --version-script=$(VERSION_SCRIPT)" "-Xlinker"
'';
NIX_CFLAGS_COMPILE = [
NIX_CFLAGS_COMPILE = toString ([
"-UDEFAULT_EGL_VENDOR_CONFIG_DIRS"
# FHS paths are added so that non-NixOS applications can find vendor files.
"-DDEFAULT_EGL_VENDOR_CONFIG_DIRS=\"${addOpenGLRunpath.driverLink}/share/glvnd/egl_vendor.d:/etc/glvnd/egl_vendor.d:/usr/share/glvnd/egl_vendor.d\""
"-Wno-error=array-bounds"
] ++ lib.optional stdenv.cc.isClang "-Wno-error";
] ++ lib.optional stdenv.cc.isClang "-Wno-error");
# Indirectly: https://bugs.freedesktop.org/show_bug.cgi?id=35268
configureFlags = stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-tls";