summary refs log tree commit diff
path: root/pkgs/applications/networking/ids/snort/default.nix
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2015-10-06 15:24:20 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2015-10-06 15:24:20 +0200
commit741bf840dad05cd1728481045466811ae8ae8281 (patch)
tree93ce9aef00773772dfb9b782f20e20b79f024d48 /pkgs/applications/networking/ids/snort/default.nix
parentfe195af94462a6769f2e2c38c1d5739337c20d57 (diff)
downloadnixpkgs-741bf840dad05cd1728481045466811ae8ae8281.tar
nixpkgs-741bf840dad05cd1728481045466811ae8ae8281.tar.gz
nixpkgs-741bf840dad05cd1728481045466811ae8ae8281.tar.bz2
nixpkgs-741bf840dad05cd1728481045466811ae8ae8281.tar.lz
nixpkgs-741bf840dad05cd1728481045466811ae8ae8281.tar.xz
nixpkgs-741bf840dad05cd1728481045466811ae8ae8281.tar.zst
nixpkgs-741bf840dad05cd1728481045466811ae8ae8281.zip
Revert "Merge pull request #9543 from NixOS/staging.post-15.06"
This reverts commit f61176c5396ed513f3d399f73f38ab78a066667f, reversing
changes made to a27ca029ee2b39e04d7d2a516a7228f4b62067fb.

Conflicts:
	pkgs/development/libraries/ncurses/default.nix
Diffstat (limited to 'pkgs/applications/networking/ids/snort/default.nix')
-rw-r--r--pkgs/applications/networking/ids/snort/default.nix12
1 files changed, 2 insertions, 10 deletions
diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix
index 62c784a7fb7..ea7e0962699 100644
--- a/pkgs/applications/networking/ids/snort/default.nix
+++ b/pkgs/applications/networking/ids/snort/default.nix
@@ -1,4 +1,4 @@
-{stdenv, makeWrapper, fetchurl, libpcap, pcre, libdnet, daq, zlib, flex, bison}:
+{stdenv, fetchurl, libpcap, pcre, libdnet, daq, zlib, flex, bison}:
 
 stdenv.mkDerivation rec {
   version = "2.9.7.2";
@@ -10,15 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "1gmlrh9ygpd5h6nnrr4090wk5n2yq2yrvwi7q6xbm6lxj4rcamyv";
   };
   
-  buildInputs = [ makeWrapper libpcap pcre libdnet daq zlib flex bison ];
-
-  enableParallelBuilding = true;
-
-  configureFlags = "--disable-static-daq --enable-control-socket --with-daq-includes=${daq}/includes --with-daq-libraries=${daq}/lib --dynamic-preprocessor-lib-dir $out/lib/snort_dynamicpreprocessor/ --dynamic-engine-lib-dir $out/lib/snort_dynamicengine";
-
-  postInstall = ''
-    wrapProgram $out/bin/snort --add-flags "--daq-dir ${daq}/lib/daq"
-  '';
+  buildInputs = [ libpcap pcre libdnet daq zlib flex bison ];
   
   meta = {
     description = "Network intrusion prevention and detection system (IDS/IPS)";