treewide: NIX_*_COMPILE -> string

2019-12-31 00:13:29 +01:00
parent ab0cfd9e03
commit 5f2b92e3ec
61 changed files with 73 additions and 111 deletions
@@ -88,9 +88,7 @@ stdenv.mkDerivation rec {
  doCheck = false;

  # glib-2.62 deprecations
-  NIX_CFLAGS_COMPILE = [
-    "-DGLIB_DISABLE_DEPRECATION_WARNINGS"
-  ];
+  NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS";

  meta = with stdenv.lib; {
    description = "Application matching framework";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {

  buildInputs = [ zlib ];

-  NIX_CFLAGS_COMPILE = [
+  NIX_CFLAGS_COMPILE = toString [
    "-Wno-error=deprecated-declarations"
    "-Wno-error=format-truncation"
    "-Wno-error=cast-function-type"
@@ -11,9 +11,7 @@ stdenv.mkDerivation rec {
  buildInputs = [ bison ];
  patches = [ ./gcc-4.3.3-fixes.patch ];
  configureFlags = [ "CFLAGS=-O3" "CXXFLAGS=-O3" ];
-  NIX_LDFLAGS = [
-    "-lm"
-  ];
+  NIX_LDFLAGS = "-lm";
  doCheck = true;

  meta = {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
    owner = "puppetlabs";
  };

-  NIX_CFLAGS_COMPILE = [ "-Wno-error=catch-value" ];
+  NIX_CFLAGS_COMPILE = "-Wno-error=catch-value";

  nativeBuildInputs = [ cmake ];

@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
  buildInputs = [ cmake sqlite libmysqlclient postgresql unixODBC ];

  cmakeFlags = [ "--no-warn-unused-cli" ];
-  NIX_CFLAGS_COMPILE = [ "-I${libmysqlclient}/include/mysql" "-L${libmysqlclient}/lib/mysql" ];
+  NIX_CFLAGS_COMPILE = "-I${libmysqlclient}/include/mysql -L${libmysqlclient}/lib/mysql";

  meta = with stdenv.lib; {
    homepage = http://cppcms.com/sql/cppdb/;
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {

  nativeBuildInputs = [ cmake ];
  buildInputs = [ gflags ];
-  NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.isAarch64 "-march=armv8-a+crc";
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isAarch64 "-march=armv8-a+crc";

  meta = with stdenv.lib; {
    homepage = https://github.com/google/crc32c;
@@ -23,9 +23,7 @@ stdenv.mkDerivation rec {

  nativeBuildInputs = [ autoreconfHook pkgconfig ];

-  NIX_LDFLAGS = [
-    "-lbluetooth"
-  ];
+  NIX_LDFLAGS = "-lbluetooth";

  postInstall = ''
    # Some programs (for example, cabal-install) have problems with the double 0
@@ -52,9 +52,7 @@ stdenv.mkDerivation rec {

  doCheck = false; # TODO: some issues with temporary files

-  NIX_LDFLAGS = [
-    "-lpthread"
-  ];
+  NIX_LDFLAGS = "-lpthread";

  enableParallelBuilding = true;

@@ -40,9 +40,7 @@ stdenv.mkDerivation rec {
  ];

  # Allow use of old proj_api.h
-  NIX_CFLAGS_COMPILE = [
-    "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1"
-  ];
+  NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1";

  # Prevent this:
  #
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
    sha256 = "1svhbjibm448ybq6gnjjzj0ak42srhihssafj0w402aj71lgaq4a";
  };

-  NIX_CFLAGS_COMPILE = [ "-Wno-error=misleading-indentation" "-Wno-error=pointer-compare" ];
+  NIX_CFLAGS_COMPILE = "-Wno-error=misleading-indentation -Wno-error=pointer-compare";

  hardeningDisable = [ "format" ];

@@ -16,9 +16,8 @@ stdenv.mkDerivation rec {
    substituteInPlace libtool --replace stdc++ c++
  '';

-  NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.isDarwin [
-    "-D_XOPEN_SOURCE" "-Wno-aligned-allocation-unavailable"
-  ];
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin
+    "-D_XOPEN_SOURCE -Wno-aligned-allocation-unavailable";

  # some packages want to link to the static tcmalloc_minimal
  # to drop the runtime dependency on gperftools
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
    owner = "puppetlabs";
  };

-  NIX_CFLAGS_COMPILE = [
+  NIX_CFLAGS_COMPILE = builtins.toString [
    "-Wno-error=ignored-qualifiers"
    "-Wno-error=class-memaccess"
    "-Wno-error=catch-value"
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
  buildInputs = [ libevent ];
  propagatedBuildInputs = [ cyrus_sasl ];

-  NIX_CFLAGS_COMPILE = [ "-fpermissive"/*gcc7*/ ];
+  NIX_CFLAGS_COMPILE = "-fpermissive";

  meta = with stdenv.lib; {
    homepage = https://libmemcached.org;
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
    sha256 = "1n2wkmvw6n80ybdwkjq8ka43z2x8mvxq49byv61b52iyz69slf7b";
  };

-  NIX_CFLAGS_COMPILE = [ "-Wno-error=format-truncation" ];
+  NIX_CFLAGS_COMPILE = "-Wno-error=format-truncation";

  buildInputs = [ ncurses perl ];

@@ -30,7 +30,7 @@ mkDerivation rec {
  # Make sure libqtav finds its libGL dependency at both link and run time
  # by adding libGL to rpath. Not sure why it wasn't done automatically like
  # the other libraries as `libGL` is part of our `buildInputs`.
-  NIX_CFLAGS_LINK = [ "-Wl,-rpath,${libGL}/lib"];
+  NIX_CFLAGS_LINK = "-Wl,-rpath,${libGL}/lib";

  preFixup = ''
    mkdir -p "$out/bin"
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
    owner = "puppetlabs";
  };

-  NIX_CFLAGS_COMPILE = [ "-Wno-error=catch-value" ];
+  NIX_CFLAGS_COMPILE = "-Wno-error=catch-value";

  nativeBuildInputs = [ cmake ];

@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {

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

  cmakeFlags = [
    (opencvFlag "TIFF" enableTIFF)
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
            gst-plugins-bad
            gst-libav
          ]);
-    in [
+    in toString [
      # This flag should be picked up through pkgconfig, but it isn't.
      "-I${gst_all_1.gstreamer.dev}/lib/gstreamer-1.0/include"

@@ -22,10 +22,10 @@ stdenv.mkDerivation rec {
    ++ lib.optionals withCplex [ "--with-cplex-incdir=${cplex}/cplex/include/ilcplex" "--with-cplex-lib=-lcplex${cplex.libSuffix}" ];

  NIX_LDFLAGS =
-    lib.optional withCplex "-L${cplex}/cplex/bin/${cplex.libArch}";
+    lib.optionalString withCplex "-L${cplex}/cplex/bin/${cplex.libArch}";

-  # Compile errors 
-  NIX_CFLAGS_COMPILE = [ "-Wno-cast-qual" ];
+  # Compile errors
+  NIX_CFLAGS_COMPILE = "-Wno-cast-qual";
  hardeningDisable = [ "format" ];

  enableParallelBuilding = true;