treewide: NIX_*_COMPILE -> string

This commit is contained in:
Robin Gloster
2019-10-30 02:29:30 +01:00
committed by Jan Tojnar
parent ab0cfd9e03
commit 5f2b92e3ec
61 changed files with 73 additions and 111 deletions

View File

@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.cc.isGNU "-Wno-error=format-truncation";
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-error=format-truncation";
/*
** We patch out a very annoying 'feature' in ./configure, which

View File

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
buildInputs = [ ecl qt4 xorgserver xkbcomp xkeyboard_config ];
NIX_CFLAGS_COMPILE = [ "-fPIC" ];
NIX_CFLAGS_COMPILE = "-fPIC";
postPatch = ''
sed -re 's@[(]in-home "gui/.command-history"[)]@(concatenate '"'"'string (ext:getenv "HOME") "/.eql-gui-command-history")@' -i gui/gui.lisp

View File

@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
buildInputs = [ gambit rsync bash ]
++ buildInputs_libraries ++ buildInputs_staticLibraries;
NIX_CFLAGS_COMPILE = [ "-I${libmysqlclient}/include/mysql" "-L${libmysqlclient}/lib/mysql" ];
NIX_CFLAGS_COMPILE = "-I${libmysqlclient}/include/mysql -L${libmysqlclient}/lib/mysql";
postPatch = ''
echo '(define (gerbil-version-string) "v${git-version}")' > src/gerbil/runtime/gx-version.scm

View File

@@ -242,10 +242,7 @@ in rec {
'method->name_and_sig_as_C_string(), p2i(method->native_function()), p2i(entry)' || exit -1
'';
hardeningDisable = [ "fortify" ];
NIX_CFLAGS_COMPILE = [
"-Wno-error=format-overflow" # newly detected by gcc7
"-Wno-error=nonnull"
];
NIX_CFLAGS_COMPILE = "-Wno-error=format-overflow -Wno-error=nonnull";
buildPhase = ''
export MX_ALT_OUTPUT_ROOT=$NIX_BUILD_TOP/mxbuild
export MX_CACHE_DIR=${makeMxCache jvmci8-mxcache}

View File

@@ -61,13 +61,13 @@ let
separateDebugInfo = true;
NIX_CFLAGS_COMPILE = [ "-Wno-error" ];
NIX_CFLAGS_COMPILE = "-Wno-error";
NIX_LDFLAGS = lib.optionals (!headless) [
NIX_LDFLAGS = toString (lib.optionals (!headless) [
"-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
] ++ lib.optionals (!headless && enableGnome2) [
"-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
];
]);
buildFlags = [ "all" ];

View File

@@ -84,7 +84,7 @@ in makePackage {
'';
# glib-2.62 deprecations
NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS";
stripDebugList = [ "." ];