From aee659e1e20d6571ef40d28740297554ecff6255 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 5 Feb 2010 22:00:51 +0000
Subject: * Fix various broken URLs / mirrors. * Updated tcpdump, ImageMagick,
 lsof.

svn path=/nixpkgs/trunk/; revision=19847
---
 pkgs/development/libraries/libpcap/default.nix | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

(limited to 'pkgs/development/libraries/libpcap')

diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix
index 5dbbf010be84a..fbd73230d7355 100644
--- a/pkgs/development/libraries/libpcap/default.nix
+++ b/pkgs/development/libraries/libpcap/default.nix
@@ -1,23 +1,18 @@
-{stdenv, fetchurl, flex, bison}:
+{ stdenv, fetchurl, flex, bison }:
 
 stdenv.mkDerivation rec {
   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 = "1h3kmj485qz1i08xs4sc3a0bmhs1rvq0h7gycs7paap2szhw8552";
+    url = "http://www.tcpdump.org/release/${name}.tar.gz";
+    sha256 = "1h3kmj485qz1i08xs4sc3a0bmhs1rvq0h7gycs7paap2szhw8552";
   };
-  buildInputs = [flex bison];
-  configureFlags = [
-      "${if stdenv.system == "i686-linux" then "--with-pcap=linux" else ""}"
-       "--with-pcap=linux"
-  ];
+  
+  buildInputs = [ flex bison ];
+  
+  configureFlags = "--with-pcap=linux";
 
   preInstall = ''ensureDir $out/bin'';
-  patches = if stdenv.system == "i686-linux"
-      then []
-      else [ ./libpcap_amd64.patch ];
-
+  
+  patches = [ ./libpcap_amd64.patch ];
 }
-- 
cgit 1.4.1