public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: NIX_*_FLAGS -> string

Browse Source
This commit is contained in:
Robin Gloster
2019-10-30 12:34:47 +01:00
committed by Jan Tojnar
parent f9f46dc327
commit 313da176d3
89 changed files with 108 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/tools/system/netdata/default.nix
View File

@@ -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

2
pkgs/tools/system/rowhammer-test/default.nix
View File

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

2
pkgs/tools/system/stress-ng/default.nix
View File

@@ -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