diff options
author | Marc Weber <marco-oweber@gmx.de> | 2009-02-12 20:28:01 +0000 |
---|---|---|
committer | Marc Weber <marco-oweber@gmx.de> | 2009-02-12 20:28:01 +0000 |
commit | 498be42912a2fc31af19e15a602aa9acc4a0702f (patch) | |
tree | 68f08e2f4ceb8c7c6a28c1e828718a09803ef1cb | |
parent | 387478ce5eaad71c8be8f387742c6a8557d3b29c (diff) |
version bump: wireshark-1.1.2, libpcap-1.0.0
svn path=/nixpkgs/trunk/; revision=14054
-rw-r--r-- | pkgs/applications/networking/sniffers/wireshark/default.nix | 7 | ||||
-rw-r--r-- | pkgs/development/libraries/libpcap/default.nix | 17 |
2 files changed, 16 insertions, 8 deletions
diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 1dbb21bb8fce9..25762db43ca4d 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -1,10 +1,11 @@ {stdenv, fetchurl, perl, pkgconfig, gtk, libpcap, flex, bison}: stdenv.mkDerivation { - name = "wireshark-1.0.3"; + name = "wireshark-1.1.2"; src = fetchurl { - url = http://www.wireshark.org/download/src/wireshark-1.0.3.tar.bz2; - sha256 = "1wmkbq0rgy7rz8mqggyay98z4qd3s9bnv5lmvx1r55sndcq6z2bp"; + url = http://www.wireshark.org/download/src/wireshark-1.1.2.tar.gz; + sha256 = "0fsf84czzxg0gpyf525lx2c9i8la26fkhqv4visz5bz2r0911yd4"; }; + configureFlags = "--with-pcap=${libpcap}"; buildInputs = [perl pkgconfig gtk libpcap flex bison]; } diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix index 324615500feee..5dbbf010be84a 100644 --- a/pkgs/development/libraries/libpcap/default.nix +++ b/pkgs/development/libraries/libpcap/default.nix @@ -1,16 +1,23 @@ {stdenv, fetchurl, flex, bison}: stdenv.mkDerivation rec { - name = "libpcap-0.9.4"; + name = "libpcap-1.0.0"; src = fetchurl { url = [ "mirror://tcpdump/release/${name}.tar.gz" "http://www.sfr-fresh.com/unix/misc/${name}.tar.gz" ]; - sha256 = "0q0cnn607kfa4y4rbz3glg5lfr8r08s8l08w8fwrr3d6njjzd71p"; + sha256 = "1h3kmj485qz1i08xs4sc3a0bmhs1rvq0h7gycs7paap2szhw8552"; }; buildInputs = [flex bison]; - configureFlags = " - ${if stdenv.system == "i686-linux" then "--with-pcap=linux" else ""} - "; + configureFlags = [ + "${if stdenv.system == "i686-linux" then "--with-pcap=linux" else ""}" + "--with-pcap=linux" + ]; + + preInstall = ''ensureDir $out/bin''; + patches = if stdenv.system == "i686-linux" + then [] + else [ ./libpcap_amd64.patch ]; + } |