diff options
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/misc/urjtag/default.nix | 12 | ||||
-rw-r--r-- | pkgs/tools/networking/p2p/amule/default.nix | 23 | ||||
-rw-r--r-- | pkgs/tools/networking/vtun/default.nix | 9 | ||||
-rw-r--r-- | pkgs/tools/security/fwknop/default.nix | 29 | ||||
-rw-r--r-- | pkgs/tools/security/modsecurity/default.nix | 22 |
5 files changed, 45 insertions, 50 deletions
diff --git a/pkgs/tools/misc/urjtag/default.nix b/pkgs/tools/misc/urjtag/default.nix index 48edb601a43f0..60a1ab325b138 100644 --- a/pkgs/tools/misc/urjtag/default.nix +++ b/pkgs/tools/misc/urjtag/default.nix @@ -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"; diff --git a/pkgs/tools/networking/p2p/amule/default.nix b/pkgs/tools/networking/p2p/amule/default.nix index ac440fc6d3381..a74242ba5e174 100644 --- a/pkgs/tools/networking/p2p/amule/default.nix +++ b/pkgs/tools/networking/p2p/amule/default.nix @@ -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" \ diff --git a/pkgs/tools/networking/vtun/default.nix b/pkgs/tools/networking/vtun/default.nix index fb0ee64cc2c0f..d2cbb5d8a4eed 100644 --- a/pkgs/tools/networking/vtun/default.nix +++ b/pkgs/tools/networking/vtun/default.nix @@ -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"; diff --git a/pkgs/tools/security/fwknop/default.nix b/pkgs/tools/security/fwknop/default.nix index 04e6d12fe427c..5f4fbea9fcd9c 100644 --- a/pkgs/tools/security/fwknop/default.nix +++ b/pkgs/tools/security/fwknop/default.nix @@ -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 diff --git a/pkgs/tools/security/modsecurity/default.nix b/pkgs/tools/security/modsecurity/default.nix index 2c02a5dd4736e..09f8c63973c79 100644 --- a/pkgs/tools/security/modsecurity/default.nix +++ b/pkgs/tools/security/modsecurity/default.nix @@ -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 |