treewide: Make more complicated configureFlags lists

wip/yesman
John Ericson 6 years ago
parent 632d24f11f
commit 85a9913edd
  1. 13
      pkgs/applications/audio/puredata/default.nix
  2. 10
      pkgs/applications/editors/nano/default.nix
  3. 8
      pkgs/applications/misc/lilyterm/default.nix
  4. 16
      pkgs/applications/science/chemistry/octopus/default.nix
  5. 24
      pkgs/applications/version-management/subversion/default.nix
  6. 6
      pkgs/desktops/gnome-2/desktop/vte/default.nix
  7. 2
      pkgs/development/interpreters/scsh/default.nix
  8. 6
      pkgs/development/libraries/classads/default.nix
  9. 10
      pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix
  10. 9
      pkgs/development/libraries/ilixi/default.nix
  11. 17
      pkgs/development/libraries/libinfinity/default.nix
  12. 13
      pkgs/development/libraries/neon/0.29.nix
  13. 13
      pkgs/development/libraries/neon/default.nix
  14. 14
      pkgs/development/libraries/tix/default.nix
  15. 19
      pkgs/development/tools/misc/dialog/default.nix
  16. 6
      pkgs/misc/jackaudio/jack1.nix
  17. 6
      pkgs/os-specific/linux/alsa-firmware/default.nix
  18. 26
      pkgs/os-specific/linux/ipsec-tools/default.nix
  19. 8
      pkgs/os-specific/linux/iptables/default.nix
  20. 46
      pkgs/servers/http/apache-httpd/2.4.nix
  21. 6
      pkgs/servers/http/couchdb/default.nix
  22. 10
      pkgs/servers/shairport-sync/default.nix
  23. 12
      pkgs/tools/misc/urjtag/default.nix
  24. 23
      pkgs/tools/networking/p2p/amule/default.nix
  25. 9
      pkgs/tools/networking/vtun/default.nix
  26. 29
      pkgs/tools/security/fwknop/default.nix
  27. 22
      pkgs/tools/security/modsecurity/default.nix

@ -15,13 +15,12 @@ stdenv.mkDerivation rec {
buildInputs = [ alsaLib libjack2 fftw ];
configureFlags = ''
--enable-alsa
--enable-jack
--enable-fftw
--disable-portaudio
'';
configureFlags = [
"--enable-alsa"
"--enable-jack"
"--enable-fftw"
"--disable-portaudio"
];
# https://github.com/pure-data/pure-data/issues/188
# --disable-oss

@ -32,11 +32,11 @@ in stdenv.mkDerivation rec {
outputs = [ "out" "info" ];
configureFlags = ''
--sysconfdir=/etc
${optionalString (!enableNls) "--disable-nls"}
${optionalString enableTiny "--enable-tiny"}
'';
configureFlags = [
"--sysconfdir=/etc"
(stdenv.lib.enableFeature enableNls "nls")
(stdenv.lib.enableFeature enableTiny "tiny")
];
postInstall = ''
cp ${nixSyntaxHighlight}/nix.nanorc $out/share/nano/

@ -40,10 +40,10 @@ stdenv.mkDerivation rec {
preConfigure = "sh autogen.sh";
configureFlags = ''
--enable-nls
--enable-safe-mode
'';
configureFlags = [
"--enable-nls"
"--enable-safe-mode"
];
meta = with stdenv.lib; {
description = "A fast, lightweight terminal emulator";

@ -17,14 +17,14 @@ in stdenv.mkDerivation {
nativeBuildInputs = [ perl procps fftw.dev ];
buildInputs = [ libyaml gfortran libxc openblas gsl fftw.out netcdf arpack ];
configureFlags = ''
--with-yaml-prefix=${libyaml}
--with-blas=-lopenblas
--with-lapack=-lopenblas
--with-fftw-prefix=${fftwAll}
--with-gsl-prefix=${gsl}
--with-libxc-prefix=${libxc}
'';
configureFlags = [
"--with-yaml-prefix=${libyaml}"
"--with-blas=-lopenblas"
"--with-lapack=-lopenblas"
"--with-fftw-prefix=${fftwAll}"
"--with-gsl-prefix=${gsl}"
"--with-libxc-prefix=${libxc}"
];
doCheck = false;
checkTarget = "check-short";

@ -42,17 +42,19 @@ let
# https://gcc.gnu.org/gcc-5/porting_to.html
CPPFLAGS = "-P";
configureFlags = ''
${if bdbSupport then "--with-berkeley-db" else "--without-berkeley-db"}
${if httpServer then "--with-apxs=${apacheHttpd.dev}/bin/apxs" else "--without-apxs"}
${if pythonBindings || perlBindings then "--with-swig=${swig}" else "--without-swig"}
${if javahlBindings then "--enable-javahl --with-jdk=${jdk}" else ""}
--disable-keychain
${if saslSupport then "--with-sasl=${sasl}" else "--without-sasl"}
${if httpSupport then "--with-serf=${serf}" else "--without-serf"}
--with-zlib=${zlib.dev}
--with-sqlite=${sqlite.dev}
'';
configureFlags = [
(stdenv.lib.withFeature bdbSupport "berkeley-db")
(stdenv.lib.withFeatureAs httpServer "apxs" "${apacheHttpd.dev}/bin/apxs")
(stdenv.lib.withFeatureAs (pythonBindings || perlBindings) "swig" swig)
(stdenv.lib.withFeatureAs saslSupport "sasl" sasl)
(stdenv.lib.withFeatureAs httpSupport "serf" serf)
"--disable-keychain"
"--with-zlib=${zlib.dev}"
"--with-sqlite=${sqlite.dev}"
] ++ stdenv.lib.optionals javahlBindings [
"--enable-javahl"
"--with-jdk=${jdk}"
];
preBuild = ''
makeFlagsArray=(APACHE_LIBEXECDIR=$out/modules)

@ -32,9 +32,9 @@ in stdenv.mkDerivation rec {
buildInputs = [ intltool glib gtk ncurses ] ++
stdenv.lib.optionals pythonSupport [python pygtk];
configureFlags = ''
${if pythonSupport then "--enable-python" else "--disable-python"}
'';
configureFlags = [
(stdenv.lib.enableFeature pythonSupport "python")
];
postInstall = stdenv.lib.optionalString pythonSupport ''
cd $(toPythonPath $out)/gtk-2.0

@ -12,7 +12,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ scheme48 ];
configureFlags = ''--with-scheme48=${scheme48}'';
configureFlags = [ "--with-scheme48=${scheme48}" ];
meta = with stdenv.lib; {
description = "A Scheme shell";

@ -12,9 +12,9 @@ stdenv.mkDerivation {
buildInputs = [ pcre ];
configureFlags = ''
--enable-namespace --enable-flexible-member
'';
configureFlags = [
"--enable-namespace" "--enable-flexible-member"
];
meta = {
homepage = http://www.cs.wisc.edu/condor/classad/;

@ -26,9 +26,13 @@ stdenv.mkDerivation rec {
patch -p1 < ${./darwin.patch}
'';
configureFlags = ''
--disable-examples --enable-failing-tests --localstatedir=/var --disable-gtk-doc --disable-docbook
'';
configureFlags = [
"--disable-examples"
"--enable-failing-tests"
"--localstatedir=/var"
"--disable-gtk-doc"
"--disable-docbook"
];
postInstall = ''
# Hm, apparently --disable-gtk-doc is ignored...

@ -14,9 +14,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ directfb libsigcxx libxml2 fontconfig ];
configureFlags = ''
--enable-log-debug --enable-debug --enable-trace --with-examples
'';
configureFlags = [
"--enable-log-debug"
"--enable-debug"
"--enable-trace"
"--with-examples"
];
meta = with stdenv.lib; {
description = "Lightweight C++ GUI toolkit for embedded Linux systems";

@ -7,7 +7,6 @@
, libintl }:
let
edf = flag: feature: (if flag then "--with-" else "--without-") + feature;
optional = cond: elem: assert cond -> elem != null; if cond then [elem] else [];
in stdenv.mkDerivation rec {
@ -28,14 +27,14 @@ in stdenv.mkDerivation rec {
propagatedBuildInputs = [ gnutls ];
configureFlags = ''
${if documentation then "--enable-gtk-doc" else "--disable-gtk-doc"}
${edf gtkWidgets "inftextgtk"}
${edf gtkWidgets "infgtk"}
${edf daemon "infinoted"}
${edf daemon "libdaemon"}
${edf avahiSupport "avahi"}
'';
configureFlags = [
(stdenv.lib.enableFeature documentation "gtk-doc")
(stdenv.lib.withFeature gtkWidgets "inftextgtk")
(stdenv.lib.withFeature gtkWidgets "infgtk")
(stdenv.lib.withFeature daemon "infinoted")
(stdenv.lib.withFeature daemon "libdaemon")
(stdenv.lib.withFeature avahiSupport "avahi")
];
passthru = {
inherit version;

@ -28,13 +28,12 @@ stdenv.mkDerivation rec {
buildInputs = [libxml2 openssl]
++ stdenv.lib.optional compressionSupport zlib;
configureFlags = ''
${if shared then "--enable-shared" else "--disable-shared"}
${if static then "--enable-static" else "--disable-static"}
${if compressionSupport then "--with-zlib" else "--without-zlib"}
${if sslSupport then "--with-ssl" else "--without-ssl"}
--enable-shared
'';
configureFlags = [
(stdenv.lib.enableFeature shared "shared")
(stdenv.lib.enableFeature static "static")
(stdenv.lib.withFeature compressionSupport "zlib")
(stdenv.lib.withFeature sslSupport "ssl")
];
passthru = {inherit compressionSupport sslSupport;};

@ -28,13 +28,12 @@ stdenv.mkDerivation rec {
buildInputs = [libxml2 openssl]
++ stdenv.lib.optional compressionSupport zlib;
configureFlags = ''
${if shared then "--enable-shared" else "--disable-shared"}
${if static then "--enable-static" else "--disable-static"}
${if compressionSupport then "--with-zlib" else "--without-zlib"}
${if sslSupport then "--with-ssl" else "--without-ssl"}
--enable-shared
'';
configureFlags = [
(stdenv.lib.enableFeature shared "shared")
(stdenv.lib.enableFeature static "static")
(stdenv.lib.withFeature compressionSupport "zlib")
(stdenv.lib.withFeature sslSupport "ssl")
];
passthru = {inherit compressionSupport sslSupport;};

@ -34,13 +34,13 @@ stdenv.mkDerivation rec {
ln -s $i private_headers/generic;
done;
'';
configureFlags = ''
--with-tclinclude=${tcl}/include
--with-tclconfig=.
--with-tkinclude=${tk.dev}/include
--with-tkconfig=.
--libdir=''${prefix}/lib
'';
configureFlags = [
"--with-tclinclude=${tcl}/include"
"--with-tclconfig=."
"--with-tkinclude=${tk.dev}/include"
"--with-tkconfig=."
"--libdir=\${prefix}/lib"
];
meta = with stdenv.lib; {
description = "A widget library for Tcl/Tk";

@ -1,12 +1,9 @@
{ stdenv, fetchurl, ncurses
, withLibrary ? false, libtool
, unicodeSupport ? true
, enableShared ? !stdenv.isDarwin
}:
let optStr = stdenv.lib.optionalString;
buildShared = !stdenv.isDarwin;
in
assert withLibrary -> libtool != null;
assert unicodeSupport -> ncurses.unicode && ncurses != null;
@ -24,14 +21,14 @@ stdenv.mkDerivation rec {
buildInputs = [ ncurses ];
configureFlags = ''
--disable-rpath-hacks
${optStr withLibrary "--with-libtool"}
--with-libtool-opts=${optStr buildShared "-shared"}
--with-ncurses${optStr unicodeSupport "w"}
'';
configureFlags = [
"--disable-rpath-hacks"
(stdenv.lib.withFeature withLibrary "libtool")
"--with-ncurses${stdenv.lib.optionalString unicodeSupport "w"}"
"--with-libtool-opts=${stdenv.lib.optionalString enableShared "-shared"}"
];
installTargets = "install${optStr withLibrary "-full"}";
installTargets = "install${stdenv.lib.optionalString withLibrary "-full"}";
meta = {
homepage = http://invisible-island.net/dialog/dialog.html;

@ -22,9 +22,9 @@ stdenv.mkDerivation rec {
sha256 = "0i6l25dmfk2ji2lrakqq9icnwjxklgcjzzk65dmsff91z2zva5rm";
};
configureFlags = ''
${if (optLibffado != null) then "--enable-firewire" else ""}
'';
configureFlags = [
(stdenv.lib.enableFeature (optLibffado != null) "firewire")
];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ optAlsaLib optDb optLibffado optCelt ];

@ -8,9 +8,9 @@ stdenv.mkDerivation rec {
sha256 = "0gfcyj5anckjn030wcxx5v2xk2s219nyf99s9m833275b5wz2piw";
};
configureFlags = ''
--with-hotplug-dir=$(out)/lib/firmware
'';
configureFlags = [
"--with-hotplug-dir=$(out)/lib/firmware"
];
dontStrip = true;

@ -28,19 +28,19 @@ stdenv.mkDerivation rec {
# fix build with newer gcc versions
preConfigure = ''substituteInPlace configure --replace "-Werror" "" '';
configureFlags = ''
--sysconfdir=/etc --localstatedir=/var
--with-kernel-headers=${linuxHeaders}/include
--disable-security-context
--enable-adminport
--enable-dpd
--enable-frag
--enable-gssapi
--enable-hybrid
--enable-natt
--enable-shared
--enable-stats
'';
configureFlags = [
"--sysconfdir=/etc --localstatedir=/var"
"--with-kernel-headers=${linuxHeaders}/include"
"--disable-security-context"
"--enable-adminport"
"--enable-dpd"
"--enable-frag"
"--enable-gssapi"
"--enable-hybrid"
"--enable-natt"
"--enable-shared"
"--enable-stats"
];
meta = {
homepage = http://ipsec-tools.sourceforge.net/;

@ -18,10 +18,10 @@ stdenv.mkDerivation rec {
export NIX_LDFLAGS="$NIX_LDFLAGS -lmnl -lnftnl"
'';
configureFlags = ''
--enable-devel
--enable-shared
'';
configureFlags = [
"--enable-devel"
"--enable-shared"
];
outputs = [ "out" "dev" ];

@ -47,26 +47,32 @@ stdenv.mkDerivation rec {
configureFlags="$configureFlags --includedir=$dev/include"
'';
configureFlags = ''
--with-apr=${apr.dev}
--with-apr-util=${aprutil.dev}
--with-z=${zlib.dev}
--with-pcre=${pcre.dev}
--disable-maintainer-mode
--disable-debugger-mode
--enable-mods-shared=all
--enable-mpms-shared=all
--enable-cern-meta
--enable-imagemap
--enable-cgi
${optionalString brotliSupport "--enable-brotli --with-brotli=${brotli}"}
${optionalString proxySupport "--enable-proxy"}
${optionalString sslSupport "--enable-ssl"}
${optionalString http2Support "--enable-http2 --with-nghttp2"}
${optionalString luaSupport "--enable-lua --with-lua=${lua5}"}
${optionalString libxml2Support "--with-libxml2=${libxml2.dev}/include/libxml2"}
--docdir=$(doc)/share/doc
'';
configureFlags = [
"--with-apr=${apr.dev}"
"--with-apr-util=${aprutil.dev}"
"--with-z=${zlib.dev}"
"--with-pcre=${pcre.dev}"
"--disable-maintainer-mode"
"--disable-debugger-mode"
"--enable-mods-shared=all"
"--enable-mpms-shared=all"
"--enable-cern-meta"
"--enable-imagemap"
"--enable-cgi"
(stdenv.lib.enableFeature proxySupport "proxy")
(stdenv.lib.enableFeature sslSupport "ssl")
(stdenv.lib.withFeatureAs libxml2Support "libxml2" "${libxml2.dev}/include/libxml2")
"--docdir=$(doc)/share/doc"
(stdenv.lib.enableFeature brotliSupport "brotli")
(stdenv.lib.withFeatureAs brotliSupport "brotli" brotli)
(stdenv.lib.enableFeature http2Support "http2")
(stdenv.lib.withFeature http2Support "nghttp2")
(stdenv.lib.enableFeature luaSupport "lua")
(stdenv.lib.withFeatureAs luaSupport "lua" lua5)
];
enableParallelBuilding = true;

@ -25,9 +25,9 @@ stdenv.mkDerivation rec {
If you wish to ignore this error pass --enable-js-trunk to ./configure.
*/
configureFlags = ''
--enable-js-trunk
'';
configureFlags = [
"--enable-js-trunk"
];
meta = with stdenv.lib; {
description = "A database that uses JSON for documents, JavaScript for MapReduce queries, and regular HTTP for an API";

@ -27,11 +27,11 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
configureFlags = ''
--with-alsa --with-pipe --with-pulseaudio --with-stdout
--with-avahi --with-ssl=openssl --with-soxr
--without-configfiles --without-initscript
'';
configureFlags = [
"--with-alsa" "--with-pipe" "--with-pulseaudio" "--with-stdout"
"--with-avahi" "--with-ssl=openssl" "--with-soxr"
"--without-configfiles" "--without-initscript"
];
meta = with stdenv.lib; {
inherit (src.meta) homepage;

@ -21,12 +21,12 @@ stdenv.mkDerivation rec {
buildInputs = [ gettext autoconf automake libtool bison flex which
subversion makeWrapper readline libftdi libusb python3 ];
configureFlags = ''
${if svfSupport then "--enable-svf" else "--disable-svf"}
${if bsdlSupport then "--enable-bsdl" else "--disable-bsdl"}
${if staplSupport then "--enable-stapl" else "--disable-stapl"}
${if jedecSupport then "--enable-jedec-exp" else "--disable-jedec-exp"}
'';
configureFlags = [
(stdenv.lib.enableFeature svfSupport "svf")
(stdenv.lib.enableFeature bsdlSupport "bsdl")
(stdenv.lib.enableFeature staplSupport "stapl")
(stdenv.lib.enableFeature jedecSupport "jedec-exp")
];
preConfigure = "./autogen.sh";

@ -8,10 +8,7 @@
assert httpServer -> libpng != null;
assert client -> libX11 != null;
with stdenv;
let
# Enable/Disable Feature
edf = enabled: flag: if enabled then "--enable-" + flag else "--disable-" + flag;
in
mkDerivation rec {
name = "aMule-2.3.2";
@ -27,15 +24,15 @@ mkDerivation rec {
enableParallelBuilding = true;
configureFlags = ''
--with-crypto-prefix=${cryptopp}
--disable-debug
--enable-optimize
${edf monolithic "monolithic"}
${edf daemon "amule-daemon"}
${edf client "amule-gui"}
${edf httpServer "webserver"}
'';
configureFlags = [
"--with-crypto-prefix=${cryptopp}"
"--disable-debug"
"--enable-optimize"
(stdenv.lib.enableFeature monolithic "monolithic")
(stdenv.lib.enableFeature daemon "amule-daemon")
(stdenv.lib.enableFeature client "amule-gui")
(stdenv.lib.enableFeature httpServer "webserver")
];
postConfigure = ''
sed -i "src/libs/ec/file_generator.pl" \

@ -20,10 +20,11 @@ stdenv.mkDerivation rec {
'';
buildInputs = [ lzo openssl zlib yacc flex ];
configureFlags = ''
--with-lzo-headers=${lzo}/include/lzo
--with-ssl-headers=${openssl.dev}/include/openssl
--with-blowfish-headers=${openssl.dev}/include/openssl'';
configureFlags = [
"--with-lzo-headers=${lzo}/include/lzo"
"--with-ssl-headers=${openssl.dev}/include/openssl"
"--with-blowfish-headers=${openssl.dev}/include/openssl"
];
meta = with stdenv.lib; {
description = "Virtual Tunnels over TCP/IP with traffic shaping, compression and encryption";

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, autoreconfHook, lib
{ stdenv, fetchFromGitHub, autoreconfHook
, libpcap, texinfo
, iptables
, gnupgSupport ? true, gnupg, gpgme # Increases dependencies!
@ -23,21 +23,18 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional gnupgSupport [ gnupg gpgme.dev ]
++ stdenv.lib.optional wgetSupport [ wget ];
configureFlags = ''
--sysconfdir=/etc
--localstatedir=/run
--with-iptables=${iptables}/sbin/iptables
${lib.optionalString (!buildServer) "--disable-server"}
${lib.optionalString (!buildClient) "--disable-client"}
${lib.optionalString gnupgSupport ''
--with-gpgme
--with-gpgme-prefix=${gpgme.dev}
--with-gpg=${gnupg}
''}
${lib.optionalString wgetSupport ''
--with-wget=${wget}/bin/wget
''}
'';
configureFlags = [
"--sysconfdir=/etc"
"--localstatedir=/run"
"--with-iptables=${iptables}/sbin/iptables"
(stdenv.lib.enableFeature buildServer "server")
(stdenv.lib.enableFeature buildClient "client")
(stdenv.lib.withFeatureAs wgetSupport wget "${wget}/bin/wget")
] ++ stdenv.lib.optionalString gnupgSupport [
"--with-gpgme"
"--with-gpgme-prefix=${gpgme.dev}"
"--with-gpg=${gnupg}"
];
# Temporary hack to copy the example configuration files into the nix-store,
# this'll probably be helpful until there's a NixOS module for that (feel free

@ -22,17 +22,17 @@ stdenv.mkDerivation rec {
buildInputs = [ curl apacheHttpd pcre apr aprutil libxml2 ] ++
optional luaSupport lua5;
configureFlags = ''
--enable-standalone-module
--enable-static
--with-curl=${curl.dev}
--with-apxs=${apacheHttpd.dev}/bin/apxs
--with-pcre=${pcre.dev}
--with-apr=${apr.dev}
--with-apu=${aprutil.dev}/bin/apu-1-config
--with-libxml=${libxml2.dev}
--with-lua=${luaValue}
'';
configureFlags = [
"--enable-standalone-module"
"--enable-static"
"--with-curl=${curl.dev}"
"--with-apxs=${apacheHttpd.dev}/bin/apxs"
"--with-pcre=${pcre.dev}"
"--with-apr=${apr.dev}"
"--with-apu=${aprutil.dev}/bin/apu-1-config"
"--with-libxml=${libxml2.dev}"
"--with-lua=${luaValue}"
];
outputs = ["out" "nginx"];
# by default modsecurity's install script copies compiled output to httpd's modules folder

Loading…
Cancel
Save