treewide: NIX_*_FLAGS -> string

This commit is contained in:
Robin Gloster
2019-12-31 00:16:46 +01:00
committed by Jan Tojnar
parent f9f46dc327
commit 313da176d3
89 changed files with 108 additions and 158 deletions
+1 -1
View File
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
buildInputs = [ sqlite ];
# needed for 1.116.0 to build with gcc7
NIX_CFLAGS_COMPILE = [
NIX_CFLAGS_COMPILE = toString [
"-Wno-implicit-fallthrough"
"-Wno-error=clobbered"
"-Wno-error=cast-function-type"
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig python ];
# error: ISO C does not support '__FUNCTION__' predefined identifier [-Werror=pedantic]
NIX_CFLAGS_COMPILE = [ "-Wno-error" ];
NIX_CFLAGS_COMPILE = "-Wno-error";
configureFlags = [ "--without-gobject" "CFLAGS=--std=gnu99" ];
+1 -1
View File
@@ -221,7 +221,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ cmake pkgconfig unzip ];
NIX_CFLAGS_COMPILE = lib.optional enableEXR "-I${ilmbase.dev}/include/OpenEXR";
NIX_CFLAGS_COMPILE = lib.optionalString enableEXR "-I${ilmbase.dev}/include/OpenEXR";
# Configure can't find the library without this.
OpenBLAS_HOME = lib.optionalString enableOpenblas openblas;
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
"-DCIVETWEB_CXX_LIBRARY=${civetweb}/lib/libcivetweb${stdenv.targetPlatform.extensions.sharedLibrary}"
];
NIX_LDFLAGS = [ "-ldl" ];
NIX_LDFLAGS = "-ldl";
meta = {
description = "Prometheus Client Library for Modern C++";
@@ -18,8 +18,8 @@ stdenv.mkDerivation {
buildInputs = [ qt5.qtbase qca2-qt5 ];
nativeBuildInputs = [ qt5.qmake ];
NIX_CFLAGS_COMPILE = [ "-I${qca2-qt5}/include/Qca-qt5/QtCrypto" ];
NIX_LDFLAGS = [ "-lqca-qt5" ];
NIX_CFLAGS_COMPILE = "-I${qca2-qt5}/include/Qca-qt5/QtCrypto";
NIX_LDFLAGS = "-lqca-qt5";
meta = with stdenv.lib; {
description = "Qt library for OAuth authentication";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
sha256 = "13mngf9kl0y2wfxqvkad0smdaag7k8fvw82b4312gx62nwhc1i6r";
};
NIX_CFLAGS_COMPILE = [ "-Wno-error=format-truncation" ];
NIX_CFLAGS_COMPILE = "-Wno-error=format-truncation";
preConfigure = ''
cd src
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
NIX_LDFLAGS = [ "-lsqlite3" ];
NIX_LDFLAGS = "-lsqlite3";
meta = {
description = "A complete sqlite3-compatible CLI front-end for libspatialite";
+1 -1
View File
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
configureFlags = [ "--with-dpdk=${dpdk}" ];
NIX_CFLAGS_COMPILE = [ "-mssse3" ]; # Necessary to compile.
NIX_CFLAGS_COMPILE = "-mssse3"; # Necessary to compile.
enableParallelBuilding = true;
@@ -100,16 +100,16 @@
sqlite = stdenv.mkDerivation rec {
pname = "sqlite-connector-odbc";
version = "0.9993";
src = fetchurl {
url = "http://www.ch-werner.de/sqliteodbc/sqliteodbc-${version}.tar.gz";
sha256 = "0dgsj28sc7f7aprmdd0n5a1rmcx6pv7170c8dfjl0x1qsjxim6hs";
};
buildInputs = [ unixODBC sqlite zlib libxml2 ];
configureFlags = [ "--with-odbc=${unixODBC}" ];
installTargets = [ "install-3" ];
# move libraries to $out/lib where they're expected to be
@@ -117,7 +117,7 @@
mkdir -p "$out/lib"
mv "$out"/*.* "$out/lib"
'';
passthru = {
fancyName = "SQLite";
driver = "lib/libsqlite3odbc.so";
+1 -1
View File
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "148361pixrm94q6v04k13s1msa04bx9yc3djb0lxpa7dlw19vhcd";
};
NIX_CFLAGS_COMPILE = [ "-Wno-error=parentheses" ];
NIX_CFLAGS_COMPILE = "-Wno-error=parentheses";
nativeBuildInputs = [ cmake doxygen ];
+1 -1
View File
@@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
# with gcc8, -Wclass-memaccess became part of -Wall and causes logging limit
# to be exceeded
NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.cc.isGNU "-Wno-class-memaccess";
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-class-memaccess";
nativeBuildInputs = [ gn ninja pkgconfig python ]
++ stdenv.lib.optionals stdenv.isDarwin [ xcbuild darwin.DarwinTools ];
@@ -32,7 +32,7 @@ in stdenv.mkDerivation rec {
buildInputs = [ zeroc_mcpp bzip2 expat openssl lmdb ]
++ lib.optionals stdenv.isDarwin [ darwin.cctools libiconv Security ];
NIX_CFLAGS_COMPILE = [ "-Wno-error=class-memaccess" "-Wno-error=deprecated-copy" ];
NIX_CFLAGS_COMPILE = "-Wno-error=class-memaccess -Wno-error=deprecated-copy";
prePatch = lib.optional stdenv.isDarwin ''
substituteInPlace Make.rules.Darwin \
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
setSourceRoot = "export sourceRoot=${zookeeper.name}/src/c";
NIX_CFLAGS_COMPILE = stdenv.lib.optionals (!stdenv.isDarwin) [ "-Wno-error=format-overflow" "-Wno-error=stringop-truncation" ];
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!stdenv.isDarwin) "-Wno-error=format-overflow -Wno-error=stringop-truncation";
buildInputs = [ zookeeper bash ];