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
@@ -53,9 +53,7 @@ rec {
      patchPhase = ''
      '';

-      NIX_CFLAGS_COMPILE = [
-        "-DMINIMAL=ON"
-      ];
+      NIX_CFLAGS_COMPILE = "-DMINIMAL=ON";
    });
  in
    stdenv.mkDerivation ((optionalAttrs (stdenv.isLinux) {
@@ -13,10 +13,7 @@ stdenv.mkDerivation rec {

  patchPhase = "sed -i /tini-static/d CMakeLists.txt";

-  NIX_CFLAGS_COMPILE = [
-    "-DPR_SET_CHILD_SUBREAPER=36"
-    "-DPR_GET_CHILD_SUBREAPER=37"
-  ];
+  NIX_CFLAGS_COMPILE = "-DPR_SET_CHILD_SUBREAPER=36 -DPR_GET_CHILD_SUBREAPER=37";

  buildInputs = [ cmake glibc glibc.static ];

@@ -167,7 +167,7 @@ callPackage (import ./generic.nix (rec {
    xenpmdpatch
  ];

-  NIX_CFLAGS_COMPILE = [
+  NIX_CFLAGS_COMPILE = toString [
    # Fix build on Glibc 2.24
    "-Wno-error=deprecated-declarations"
    # Fix build with GCC8