summaryrefslogtreecommitdiffstats
path: root/pkgs/tools
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/tools')
-rw-r--r--pkgs/tools/audio/gvolicon/default.nix2
-rw-r--r--pkgs/tools/filesystems/irods/default.nix7
-rw-r--r--pkgs/tools/misc/ldmtool/default.nix2
-rw-r--r--pkgs/tools/security/gpgstats/default.nix4
-rw-r--r--pkgs/tools/text/sgml/jade/default.nix2
5 files changed, 7 insertions, 10 deletions
diff --git a/pkgs/tools/audio/gvolicon/default.nix b/pkgs/tools/audio/gvolicon/default.nix
index c66c6bc1f7e0..9029eb38b06f 100644
--- a/pkgs/tools/audio/gvolicon/default.nix
+++ b/pkgs/tools/audio/gvolicon/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
makeFlags = [ "PREFIX=$(out)" ];
- NIX_CFLAGS_COMPILE = [ "-D_POSIX_C_SOURCE" ];
+ NIX_CFLAGS_COMPILE = "-D_POSIX_C_SOURCE";
meta = {
description = "A simple and lightweight volume icon that sits in your system tray";
diff --git a/pkgs/tools/filesystems/irods/default.nix b/pkgs/tools/filesystems/irods/default.nix
index 56fc2e40ba2f..b6099c099f32 100644
--- a/pkgs/tools/filesystems/irods/default.nix
+++ b/pkgs/tools/filesystems/irods/default.nix
@@ -30,11 +30,8 @@ in rec {
# but we don't use /usr with nix, so remove only 2 items.
patches = [ ./irods_root_path.patch ];
- NIX_CFLAGS_COMPILE = [
- # fix build with recent llvm versions
- "-Wno-deprecated-register"
- "-Wno-deprecated-declarations"
- ];
+ # fix build with recent llvm versions
+ NIX_CFLAGS_COMPILE = "-Wno-deprecated-register -Wno-deprecated-declarations";
preConfigure = common.preConfigure + ''
patchShebangs ./test
diff --git a/pkgs/tools/misc/ldmtool/default.nix b/pkgs/tools/misc/ldmtool/default.nix
index d1d3996bd620..734586fb1ab3 100644
--- a/pkgs/tools/misc/ldmtool/default.nix
+++ b/pkgs/tools/misc/ldmtool/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
'';
# glib-2.62 deprecations
- NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
+ NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS";
configureScript = "sh autogen.sh";
diff --git a/pkgs/tools/security/gpgstats/default.nix b/pkgs/tools/security/gpgstats/default.nix
index 34e8c7bd6796..c3a14f62c766 100644
--- a/pkgs/tools/security/gpgstats/default.nix
+++ b/pkgs/tools/security/gpgstats/default.nix
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
cp gpgstats $out/bin
'';
- NIX_CFLAGS_COMPILE = stdenv.lib.optionals (!stdenv.is64bit)
- [ "-D_FILE_OFFSET_BITS=64" "-DLARGEFILE_SOURCE=1" ];
+ NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!stdenv.is64bit)
+ "-D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1";
meta = with stdenv.lib; {
description = "Calculates statistics on the keys in your gpg key-ring";
diff --git a/pkgs/tools/text/sgml/jade/default.nix b/pkgs/tools/text/sgml/jade/default.nix
index b7f8bd6df381..2cc40510121b 100644
--- a/pkgs/tools/text/sgml/jade/default.nix
+++ b/pkgs/tools/text/sgml/jade/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
buildInputs = [ gnum4 ];
- NIX_CFLAGS_COMPILE = [ "-Wno-deprecated" ];
+ NIX_CFLAGS_COMPILE = "-Wno-deprecated";
preInstall = ''
install -d -m755 "$out"/lib