diff options
| author | Robin Gloster <mail@glob.in> | 2019-10-30 12:34:47 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-12-31 00:16:46 +0100 |
| commit | 313da176d35efefbcf36b41ec348c38403581e83 (patch) | |
| tree | cd7bba63111f2330601c18f0b2a33b65c3b9bbab /pkgs/tools/system | |
| parent | f9f46dc327c7e659e84d558f1309e16e16e8245a (diff) | |
| download | nixpkgs-313da176d35efefbcf36b41ec348c38403581e83.tar nixpkgs-313da176d35efefbcf36b41ec348c38403581e83.tar.gz nixpkgs-313da176d35efefbcf36b41ec348c38403581e83.tar.bz2 nixpkgs-313da176d35efefbcf36b41ec348c38403581e83.tar.lz nixpkgs-313da176d35efefbcf36b41ec348c38403581e83.tar.xz nixpkgs-313da176d35efefbcf36b41ec348c38403581e83.tar.zst nixpkgs-313da176d35efefbcf36b41ec348c38403581e83.zip | |
treewide: NIX_*_FLAGS -> string
Diffstat (limited to 'pkgs/tools/system')
| -rw-r--r-- | pkgs/tools/system/netdata/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/system/rowhammer-test/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/system/stress-ng/default.nix | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index ff6a6e03cc8..487d6541b5f 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ./no-files-in-etc-and-var.patch ]; - NIX_CFLAGS_COMPILE = optional withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1"; + NIX_CFLAGS_COMPILE = optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1"; postInstall = optionalString (!stdenv.isDarwin) '' # rename this plugin so netdata will look for setuid wrapper diff --git a/pkgs/tools/system/rowhammer-test/default.nix b/pkgs/tools/system/rowhammer-test/default.nix index 5a3ba8b6619..64c184a6122 100644 --- a/pkgs/tools/system/rowhammer-test/default.nix +++ b/pkgs/tools/system/rowhammer-test/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "1fbfcnm5gjish47wdvikcsgzlb5vnlfqlzzm6mwiw2j5qkq0914i"; }; - NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.isi686 "-Wno-error=format"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isi686 "-Wno-error=format"; buildPhase = "sh -e make.sh"; diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index c8748efc302..7d3e62d7beb 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { "BASHDIR=${placeholder "out"}/share/bash-completion/completions" ]; - NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.hostPlatform.isMusl "-D_LINUX_SYSINFO_H=1"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.hostPlatform.isMusl "-D_LINUX_SYSINFO_H=1"; # Won't build on i686 because the binary will be linked again in the # install phase without checking the dependencies. This will prevent |