summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@protonmail.ch>2019-06-19 11:36:06 -0400
committerworldofpeace <worldofpeace@protonmail.ch>2019-07-01 04:23:51 -0400
commitcab7c6cbd964a99db55ba55960c8ddbaf294bc67 (patch)
tree34b0121cc741fae8995d84a5578494eca3858377
parentc79ec3323e9eee544217742df1e032bb5b601296 (diff)
treewide: use dontConfigure
-rw-r--r--nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix4
-rw-r--r--nixos/modules/services/web-servers/lighttpd/collectd.nix2
-rw-r--r--pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix2
-rw-r--r--pkgs/applications/editors/emacs-modes/quack/default.nix2
-rw-r--r--pkgs/applications/misc/batti/default.nix4
-rw-r--r--pkgs/applications/misc/cdrtools/default.nix2
-rw-r--r--pkgs/applications/networking/cluster/hadoop/default.nix4
-rw-r--r--pkgs/applications/networking/sync/rsync/rrsync.nix2
-rw-r--r--pkgs/applications/video/dvb-apps/default.nix2
-rw-r--r--pkgs/development/libraries/zlib/default.nix2
-rw-r--r--pkgs/development/ocaml-modules/cryptgps/default.nix2
-rw-r--r--pkgs/development/ocaml-modules/expat/0.9.nix2
-rw-r--r--pkgs/development/ocaml-modules/extlib/default.nix2
-rw-r--r--pkgs/development/ocaml-modules/http/default.nix2
-rw-r--r--pkgs/development/ocaml-modules/pcre/default.nix2
-rw-r--r--pkgs/development/tools/java/jhiccup/default.nix2
-rw-r--r--pkgs/development/tools/misc/ycmd/default.nix2
-rw-r--r--pkgs/misc/apulse/pressureaudio.nix8
-rw-r--r--pkgs/os-specific/linux/trace-cmd/default.nix2
-rw-r--r--pkgs/servers/foundationdb/vsmake.nix2
-rw-r--r--pkgs/tools/archivers/unp/default.nix2
-rw-r--r--pkgs/tools/graphics/glxinfo/default.nix2
-rw-r--r--pkgs/tools/graphics/rocket/default.nix2
-rw-r--r--pkgs/tools/misc/hdfjava/default.nix2
-rw-r--r--pkgs/tools/networking/wrk2/default.nix2
-rw-r--r--pkgs/top-level/emacs-packages.nix2
26 files changed, 32 insertions, 32 deletions
diff --git a/nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix b/nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix
index bd114f0d2cca..fd19d8020fb8 100644
--- a/nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix
+++ b/nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix
@@ -19,7 +19,7 @@ nix-shell -E 'with import <nixpkgs> { }; brscan4-etc-files.override{netDevices=[
*/
-with lib;
+with lib;
let
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ brscan4 ];
- configurePhase = ":";
+ dontConfigure = true;
buildPhase = ''
TARGET_DIR="$out/etc/opt/brother/scanner/brscan4"
diff --git a/nixos/modules/services/web-servers/lighttpd/collectd.nix b/nixos/modules/services/web-servers/lighttpd/collectd.nix
index e70c980d5243..3f262451c2cb 100644
--- a/nixos/modules/services/web-servers/lighttpd/collectd.nix
+++ b/nixos/modules/services/web-servers/lighttpd/collectd.nix
@@ -12,7 +12,7 @@ let
defaultCollectionCgi = config.services.collectd.package.overrideDerivation(old: {
name = "collection.cgi";
- configurePhase = "true";
+ dontConfigure = true;
buildPhase = "true";
installPhase = ''
substituteInPlace contrib/collection.cgi --replace '"/etc/collection.conf"' '$ENV{COLLECTION_CONF}'
diff --git a/pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix b/pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix
index 8980dc1f0a9a..8b3a0476e48c 100644
--- a/pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix
+++ b/pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix
@@ -5,7 +5,7 @@ let
name = emacs.name + "-sources";
src = emacs.src;
- configurePhase = ":";
+ dontConfigure = true;
dontBuild = true;
doCheck = false;
fixupPhase = ":";
diff --git a/pkgs/applications/editors/emacs-modes/quack/default.nix b/pkgs/applications/editors/emacs-modes/quack/default.nix
index 95634a24ded4..29b3a72e9f0d 100644
--- a/pkgs/applications/editors/emacs-modes/quack/default.nix
+++ b/pkgs/applications/editors/emacs-modes/quack/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
buildInputs = [ emacs ];
unpackPhase = "true";
- configurePhase = "true";
+ dontConfigure = true;
installPhase = "true";
buildPhase = ''
diff --git a/pkgs/applications/misc/batti/default.nix b/pkgs/applications/misc/batti/default.nix
index 283e7f199071..9322aefb2d69 100644
--- a/pkgs/applications/misc/batti/default.nix
+++ b/pkgs/applications/misc/batti/default.nix
@@ -18,7 +18,7 @@ in stdenv.mkDerivation rec {
buildInputs = with stdenv.lib;
[ pkgconfig gettext python gtk2 pygtk dbus-python gdk_pixbuf upower makeWrapper ];
- configurePhase = "true";
+ dontConfigure = true;
buildPhase = ''
python setup.py build
@@ -44,7 +44,7 @@ in stdenv.mkDerivation rec {
license = licenses.lgpl2Plus;
maintainers = [ maintainers.AndersonTorres ];
platforms = platforms.linux;
- broken = true; # see https://github.com/NixOS/nixpkgs/pull/4031#issuecomment-56283520
+ broken = true; # see https://github.com/NixOS/nixpkgs/pull/4031#issuecomment-56283520
};
}
diff --git a/pkgs/applications/misc/cdrtools/default.nix b/pkgs/applications/misc/cdrtools/default.nix
index a46565eb76ba..3738fb83c705 100644
--- a/pkgs/applications/misc/cdrtools/default.nix
+++ b/pkgs/applications/misc/cdrtools/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
substituteInPlace man/Makefile --replace "man4" ""
'';
- configurePhase = "true";
+ dontConfigure = true;
GMAKE_NOWARN = true;
diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix
index dfe6513bf0c1..42c043d0007f 100644
--- a/pkgs/applications/networking/cluster/hadoop/default.nix
+++ b/pkgs/applications/networking/cluster/hadoop/default.nix
@@ -19,7 +19,7 @@ let
# perform fake build to make a fixed-output derivation of dependencies downloaded from maven central (~100Mb in ~3000 files)
fetched-maven-deps = stdenv.mkDerivation {
name = "hadoop-${version}-maven-deps";
- inherit src postUnpack nativeBuildInputs buildInputs configurePhase;
+ inherit src postUnpack nativeBuildInputs buildInputs;
buildPhase = ''
while mvn package -Dmaven.repo.local=$out/.m2 ${mavenFlags} -Dmaven.wagon.rto=5000; [ $? = 1 ]; do
echo "timeout, restart maven to continue downloading"
@@ -51,7 +51,7 @@ let
fi
done
'';
- configurePhase = "true"; # do not trigger cmake hook
+ dontConfigure = true; # do not trigger cmake hook
mavenFlags = "-Drequire.snappy -Drequire.bzip2 -DskipTests -Pdist,native -e";
buildPhase = ''
# 'maven.repo.local' must be writable
diff --git a/pkgs/applications/networking/sync/rsync/rrsync.nix b/pkgs/applications/networking/sync/rsync/rrsync.nix
index 7563b0ea1950..12f992d44a5a 100644
--- a/pkgs/applications/networking/sync/rsync/rrsync.nix
+++ b/pkgs/applications/networking/sync/rsync/rrsync.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
# Skip configure and build phases.
# We just want something from the support directory
- configurePhase = "true";
+ dontConfigure = true;
dontBuild = true;
postPatch = ''
diff --git a/pkgs/applications/video/dvb-apps/default.nix b/pkgs/applications/video/dvb-apps/default.nix
index 6281c7884015..a032ef654aa3 100644
--- a/pkgs/applications/video/dvb-apps/default.nix
+++ b/pkgs/applications/video/dvb-apps/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
buildInputs = [ perl ];
- configurePhase = "true"; # skip configure
+ dontConfigure = true; # skip configure
installPhase = "make prefix=$out install";
diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix
index 3a5638b22814..7fb5be1c3434 100644
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/pkgs/development/libraries/zlib/default.nix
@@ -86,5 +86,5 @@ stdenv.mkDerivation (rec {
export CHOST=${stdenv.hostPlatform.config}
'';
} // stdenv.lib.optionalAttrs (stdenv.hostPlatform.libc == "msvcrt") {
- configurePhase = ":";
+ dontConfigure = true;
})
diff --git a/pkgs/development/ocaml-modules/cryptgps/default.nix b/pkgs/development/ocaml-modules/cryptgps/default.nix
index f8eb80837a3e..7720650ddfc9 100644
--- a/pkgs/development/ocaml-modules/cryptgps/default.nix
+++ b/pkgs/development/ocaml-modules/cryptgps/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
buildInputs = [ocaml findlib];
- configurePhase = "true"; # Skip configure phase
+ dontConfigure = true; # Skip configure phase
createFindlibDestdir = true;
diff --git a/pkgs/development/ocaml-modules/expat/0.9.nix b/pkgs/development/ocaml-modules/expat/0.9.nix
index 5fcc317d9408..98ab04beb57c 100644
--- a/pkgs/development/ocaml-modules/expat/0.9.nix
+++ b/pkgs/development/ocaml-modules/expat/0.9.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
--replace "gcc" "\$(CC)"
'';
- configurePhase = "true"; # Skip configure
+ dontConfigure = true; # Skip configure
buildPhase = ''
make all allopt
diff --git a/pkgs/development/ocaml-modules/extlib/default.nix b/pkgs/development/ocaml-modules/extlib/default.nix
index dba3e2569574..df0bd9133d3c 100644
--- a/pkgs/development/ocaml-modules/extlib/default.nix
+++ b/pkgs/development/ocaml-modules/extlib/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
createFindlibDestdir = true;
- configurePhase = "true"; # Skip configure
+ dontConfigure = true; # Skip configure
# De facto, option minimal=1 seems to be the default. See the README.
buildPhase = "make ${if minimal then "minimal=1" else ""} build";
installPhase = "make ${if minimal then "minimal=1" else ""} install";
diff --git a/pkgs/development/ocaml-modules/http/default.nix b/pkgs/development/ocaml-modules/http/default.nix
index b9b530ac599e..4a8b39063361 100644
--- a/pkgs/development/ocaml-modules/http/default.nix
+++ b/pkgs/development/ocaml-modules/http/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
substituteInPlace Makefile --replace "SHELL=/bin/bash" "SHELL=$BASH"
'';
- configurePhase = "true"; # Skip configure phase
+ dontConfigure = true; # Skip configure phase
buildPhase = ''
make all opt
diff --git a/pkgs/development/ocaml-modules/pcre/default.nix b/pkgs/development/ocaml-modules/pcre/default.nix
index fb3b67b03b78..6428670ebb2f 100644
--- a/pkgs/development/ocaml-modules/pcre/default.nix
+++ b/pkgs/development/ocaml-modules/pcre/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
createFindlibDestdir = true;
- configurePhase = "true"; # Skip configure phase
+ dontConfigure = true; # Skip configure phase
meta = with stdenv.lib; {
homepage = https://bitbucket.org/mmottl/pcre-ocaml;
diff --git a/pkgs/development/tools/java/jhiccup/default.nix b/pkgs/development/tools/java/jhiccup/default.nix
index 6fb34588cd0b..4577de0cde4c 100644
--- a/pkgs/development/tools/java/jhiccup/default.nix
+++ b/pkgs/development/tools/java/jhiccup/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1hsvi8wjh615fnjf75h7b5afp04chqcgvini30vfcn3m9a5icbgy";
};
- configurePhase = ":";
+ dontConfigure = true;
buildPhase = ":";
installPhase = ''
mkdir -p $out/bin $out/share/java
diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix
index 062f90e3389d..2e67da18ae9a 100644
--- a/pkgs/development/tools/misc/ycmd/default.nix
+++ b/pkgs/development/tools/misc/ycmd/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
${python.interpreter} build.py --system-libclang --clang-completer --system-boost
'';
- configurePhase = ":";
+ dontConfigure = true;
# remove the tests
#
diff --git a/pkgs/misc/apulse/pressureaudio.nix b/pkgs/misc/apulse/pressureaudio.nix
index 142b72784578..710712fe5084 100644
--- a/pkgs/misc/apulse/pressureaudio.nix
+++ b/pkgs/misc/apulse/pressureaudio.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkgconfig intltool autoreconfHook ];
- configurePhase = ":";
+ dontConfigure = true;
buildPhase = ":";
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
Name: libpulse
Description: PulseAudio Client Interface
Version: ${libpulseaudio.version}-rebootstrapped
- Libs: -L$out/lib -lpulse
+ Libs: -L$out/lib -lpulse
Cflags: -I$out/include -D_REENTRANT
EOF
@@ -44,7 +44,7 @@ stdenv.mkDerivation {
Name: libpulse-simple
Description: PulseAudio Simplified Synchronous Client Interface
Version: ${libpulseaudio.version}-rebootstrapped
- Libs: -L$out/lib -lpulse-simple
+ Libs: -L$out/lib -lpulse-simple
Cflags: -I$out/include -D_REENTRANT
Requires: libpulse
EOF
@@ -53,7 +53,7 @@ stdenv.mkDerivation {
Name: libpulse-mainloop-glib
Description: PulseAudio GLib 2.0 Main Loop Wrapper
Version: ${libpulseaudio.version}-rebootstrapped
- Libs: -L$out/lib -lpulse-mainloop-glib
+ Libs: -L$out/lib -lpulse-mainloop-glib
Cflags: -I$out/include -D_REENTRANT
Requires: libpulse glib-2.0
EOF
diff --git a/pkgs/os-specific/linux/trace-cmd/default.nix b/pkgs/os-specific/linux/trace-cmd/default.nix
index 1d1712f6b476..33dbfe5bf0a7 100644
--- a/pkgs/os-specific/linux/trace-cmd/default.nix
+++ b/pkgs/os-specific/linux/trace-cmd/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
buildInputs = [ asciidoc libxslt ];
- configurePhase = "true";
+ dontConfigure = true;
buildPhase = "make prefix=$out MANPAGE_DOCBOOK_XSL=${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl all doc";
installPhase = "make prefix=$out install install_doc";
diff --git a/pkgs/servers/foundationdb/vsmake.nix b/pkgs/servers/foundationdb/vsmake.nix
index 9871afb0de68..0eb71492be3e 100644
--- a/pkgs/servers/foundationdb/vsmake.nix
+++ b/pkgs/servers/foundationdb/vsmake.nix
@@ -20,7 +20,7 @@ let
sha256 = "14mc7gsnnahdjaxbbslzk79rc0d12h1i681cd3srdwr3fzynlar2";
};
- configurePhase = ":";
+ dontConfigure = true;
buildPhase = ":";
installPhase = "mkdir -p $out/include && cp -R boost $out/include/";
};
diff --git a/pkgs/tools/archivers/unp/default.nix b/pkgs/tools/archivers/unp/default.nix
index 6880a49b4db7..b9c549d670bf 100644
--- a/pkgs/tools/archivers/unp/default.nix
+++ b/pkgs/tools/archivers/unp/default.nix
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
name = "unp_2.0_pre7+nmu1.tar.bz2";
};
- configurePhase = "true";
+ dontConfigure = true;
buildPhase = "true";
installPhase = ''
mkdir -p $out/bin
diff --git a/pkgs/tools/graphics/glxinfo/default.nix b/pkgs/tools/graphics/glxinfo/default.nix
index 6a2a3a5a46e8..1f8a98e0296b 100644
--- a/pkgs/tools/graphics/glxinfo/default.nix
+++ b/pkgs/tools/graphics/glxinfo/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libX11 libGL ];
- configurePhase = "true";
+ dontConfigure = true;
buildPhase = "
$CC src/xdemos/{glxinfo.c,glinfo_common.c} -o glxinfo -lGL -lX11
diff --git a/pkgs/tools/graphics/rocket/default.nix b/pkgs/tools/graphics/rocket/default.nix
index 513439989501..c27eacaec8a2 100644
--- a/pkgs/tools/graphics/rocket/default.nix
+++ b/pkgs/tools/graphics/rocket/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ qmake ];
buildInputs = [ qtbase ];
- configurePhase = ":";
+ dontConfigure = true;
installPhase = ''
mkdir -p $out/bin
diff --git a/pkgs/tools/misc/hdfjava/default.nix b/pkgs/tools/misc/hdfjava/default.nix
index 553e78c58a7f..0fe72425d79c 100644
--- a/pkgs/tools/misc/hdfjava/default.nix
+++ b/pkgs/tools/misc/hdfjava/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake javac ];
- configurePhase = "true";
+ dontConfigure = true;
buildPhase = "./build-hdfjava-unix.sh";
installPhase = ''
mkdir -p $out
diff --git a/pkgs/tools/networking/wrk2/default.nix b/pkgs/tools/networking/wrk2/default.nix
index 5caad0874f7c..e2e638ad485b 100644
--- a/pkgs/tools/networking/wrk2/default.nix
+++ b/pkgs/tools/networking/wrk2/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
--replace 'struct luaL_reg ' 'struct luaL_Reg '
'';
- configurePhase = ":";
+ dontConfigure = true;
installPhase = ''
mkdir -p $out/bin
mv ./wrk $out/bin/wrk2
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 953c25de0e8d..6df20d926d7f 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -334,7 +334,7 @@ let
version = "2.12";
src = external.rtags.src;
- configurePhase = ":";
+ dontConfigure = true;
propagatedUserEnvPkgs = [ external.rtags ];
recipe = writeText "recipe" ''