summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2016-09-01 10:46:11 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2016-09-12 23:35:41 +0200
commit03fea35ebe0628ae7c5eccec5477977fa38e6ae6 (patch)
tree52cf4d648d381038873ba7292872bd57379c6b66
parentchatzilla: 0.9.91 -> 0.9.92 (diff)
downloadnixpkgs-03fea35ebe0628ae7c5eccec5477977fa38e6ae6.tar.gz
enableParallelBuild -> enableParallelBuilding
(cherry picked from commit 02ee9d83d06b812009dc1f7fd203490a080fc35c)
-rw-r--r--pkgs/applications/networking/irc/communi/default.nix2
-rw-r--r--pkgs/development/libraries/belle-sip/default.nix2
-rw-r--r--pkgs/development/libraries/capstone/default.nix2
-rw-r--r--pkgs/development/libraries/libcommuni/default.nix2
-rw-r--r--pkgs/tools/filesystems/netatalk/default.nix2
5 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/networking/irc/communi/default.nix b/pkgs/applications/networking/irc/communi/default.nix
index 05a597199025..a2f07b2ec42f 100644
--- a/pkgs/applications/networking/irc/communi/default.nix
+++ b/pkgs/applications/networking/irc/communi/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libcommuni qt5.qtbase ];
- enableParallelBuild = true;
+ enableParallelBuilding = true;
configurePhase = ''
export QMAKEFEATURES=${libcommuni}/features
diff --git a/pkgs/development/libraries/belle-sip/default.nix b/pkgs/development/libraries/belle-sip/default.nix
index 5975a61ff77c..a6ab8cc5c468 100644
--- a/pkgs/development/libraries/belle-sip/default.nix
+++ b/pkgs/development/libraries/belle-sip/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
"--with-polarssl=${polarssl}"
];
- enableParallelBuild = true;
+ enableParallelBuilding = true;
meta = with stdenv.lib; {
homepage = http://www.linphone.org/index.php/eng;
diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/development/libraries/capstone/default.nix
index a72532ee35bc..50fa050cf0cb 100644
--- a/pkgs/development/libraries/capstone/default.nix
+++ b/pkgs/development/libraries/capstone/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ cmake ];
- enableParallelBuild = true;
+ enableParallelBuilding = true;
meta = {
description = "advanced disassembly library";
diff --git a/pkgs/development/libraries/libcommuni/default.nix b/pkgs/development/libraries/libcommuni/default.nix
index e8debfda1de5..cb1ef5c26e70 100644
--- a/pkgs/development/libraries/libcommuni/default.nix
+++ b/pkgs/development/libraries/libcommuni/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
buildInputs = [ qt5.qtbase ];
- enableParallelBuild = true;
+ enableParallelBuilding = true;
configurePhase = ''
sed -i -e 's|/bin/pwd|pwd|g' configure
diff --git a/pkgs/tools/filesystems/netatalk/default.nix b/pkgs/tools/filesystems/netatalk/default.nix
index 7e4ea032bb39..9060e0e6e996 100644
--- a/pkgs/tools/filesystems/netatalk/default.nix
+++ b/pkgs/tools/filesystems/netatalk/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec{
"--localstatedir=/var/lib"
];
- enableParallelBuild = true;
+ enableParallelBuilding = true;
meta = {
description = "Apple Filing Protocol Server";