public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

version bump: wireshark-1.1.2, libpcap-1.0.0

Browse Source 
svn path=/nixpkgs/trunk/; revision=14054
This commit is contained in:
Marc Weber 2009-02-12 20:28:01 +00:00
parent 387478ce5e
commit 498be42912
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/networking/sniffers/wireshark/default.nix
View File

@ -1,10 +1,11 @@
{stdenv, fetchurl, perl, pkgconfig, gtk, libpcap, flex, bison}: {stdenv, fetchurl, perl, pkgconfig, gtk, libpcap, flex, bison}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "wireshark-1.0.3"; name = "wireshark-1.1.2";
src = fetchurl { src = fetchurl {
url = http://www.wireshark.org/download/src/wireshark-1.0.3.tar.bz2; url = http://www.wireshark.org/download/src/wireshark-1.1.2.tar.gz;
sha256 = "1wmkbq0rgy7rz8mqggyay98z4qd3s9bnv5lmvx1r55sndcq6z2bp"; sha256 = "0fsf84czzxg0gpyf525lx2c9i8la26fkhqv4visz5bz2r0911yd4";
}; };
configureFlags = "--with-pcap=${libpcap}";
buildInputs = [perl pkgconfig gtk libpcap flex bison]; buildInputs = [perl pkgconfig gtk libpcap flex bison];
} }

17
pkgs/development/libraries/libpcap/default.nix
View File

@ -1,16 +1,23 @@
{stdenv, fetchurl, flex, bison}: {stdenv, fetchurl, flex, bison}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libpcap-0.9.4"; name = "libpcap-1.0.0";
src = fetchurl { src = fetchurl {
url = [ url = [
"mirror://tcpdump/release/${name}.tar.gz" "mirror://tcpdump/release/${name}.tar.gz"
"http://www.sfr-fresh.com/unix/misc/${name}.tar.gz" "http://www.sfr-fresh.com/unix/misc/${name}.tar.gz"
]; ];
sha256 = "0q0cnn607kfa4y4rbz3glg5lfr8r08s8l08w8fwrr3d6njjzd71p"; sha256 = "1h3kmj485qz1i08xs4sc3a0bmhs1rvq0h7gycs7paap2szhw8552";
}; };
buildInputs = [flex bison]; buildInputs = [flex bison];
configureFlags = " configureFlags = [
${if stdenv.system == "i686-linux" then "--with-pcap=linux" else ""} "${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 ];
} }