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/glefw/default.nix   |  4 +++-
 pkgs/development/libraries/glew/default.nix    |  9 +++++----
 pkgs/development/libraries/libpcap/default.nix | 25 ++++++++++---------------
 pkgs/development/libraries/tk/8.5.7.nix        | 22 ----------------------
 pkgs/development/libraries/tk/default.nix      | 22 ++++++++++++++++++++++
 5 files changed, 40 insertions(+), 42 deletions(-)
 delete mode 100644 pkgs/development/libraries/tk/8.5.7.nix
 create mode 100644 pkgs/development/libraries/tk/default.nix

(limited to 'pkgs/development/libraries')

diff --git a/pkgs/development/libraries/glefw/default.nix b/pkgs/development/libraries/glefw/default.nix
index e58244cf818e2..bf4d0f504de68 100644
--- a/pkgs/development/libraries/glefw/default.nix
+++ b/pkgs/development/libraries/glefw/default.nix
@@ -1,9 +1,10 @@
 args: with args;
+
 stdenv.mkDerivation {
   name = "glefw-2.6";
 
   src = fetchurl {
-    url = http://prdownloads.sourceforge.net/glfw/glfw-2.6.tar.bz2;
+    url = mirror://sourceforge/glfw/glfw-2.6.tar.bz2;
     sha256 = "1jnz7szax7410qrkiwkvq34sxy11w46ybyqbkaczdyvqas6cm1hv";
   };
 
@@ -13,6 +14,7 @@ stdenv.mkDerivation {
     ensureDir $out
     make x11-install PREFIX=$out
   '';
+  
   installPhase=":";
 
   meta = { 
diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix
index ff3baabe339a7..d53d011faba49 100644
--- a/pkgs/development/libraries/glew/default.nix
+++ b/pkgs/development/libraries/glew/default.nix
@@ -1,18 +1,19 @@
 args: with args;
+
 stdenv.mkDerivation {
   name = "glew-1.5.2";
 
   src = fetchurl {
-    url = http://dfn.dl.sourceforge.net/sourceforge/glew/glew-1.5.2.tgz;
+    url = mirror://sourceforge/glew/glew-1.5.2.tgz;
     sha256 = "0dh5wpfq7aaldkiwcqmm9w59c2qcglkjv8zazmnm8n5771n3caj8";
   };
 
   buildInputs = [mesa x11 libXmu libXi];
 
   meta = { 
-      description = "cross-platform open-source C/C++ extension loading library";
-      homepage = http://glew.sourceforge.net/;
-      license = ["BSD" "GLX" "SGI-B" "GPL2"]; # License description copied from gentoo-1.4.0 
+    description = "cross-platform open-source C/C++ extension loading library";
+    homepage = http://glew.sourceforge.net/;
+    license = ["BSD" "GLX" "SGI-B" "GPL2"]; # License description copied from gentoo-1.4.0 
   };
 
   installPhase="GLEW_DEST=\$out make install";
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 ];
 }
diff --git a/pkgs/development/libraries/tk/8.5.7.nix b/pkgs/development/libraries/tk/8.5.7.nix
deleted file mode 100644
index bf6da7b65982e..0000000000000
--- a/pkgs/development/libraries/tk/8.5.7.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, tcl, x11 }:
-
-stdenv.mkDerivation {
-  name = "tk-8.5.7";
-  
-  src = fetchurl {
-    url = "mirror://sourceforge/tcl/tk8.5.7-src.tar.gz";
-    sha256 = "0c5gsy3nlwl0wn9swz4k4v7phy7nzjl317gca1jykgf4jz9nwdnr";
-  };
-  
-  postInstall = ''
-    ln -s $out/bin/wish* $out/bin/wish
-  '';
-  
-  configureFlags = "--with-tcl=${tcl}/lib";
-  
-  preConfigure = "cd unix";
-
-  buildInputs = [tcl x11];
-  
-  inherit tcl;
-}
diff --git a/pkgs/development/libraries/tk/default.nix b/pkgs/development/libraries/tk/default.nix
new file mode 100644
index 0000000000000..bf6da7b65982e
--- /dev/null
+++ b/pkgs/development/libraries/tk/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, tcl, x11 }:
+
+stdenv.mkDerivation {
+  name = "tk-8.5.7";
+  
+  src = fetchurl {
+    url = "mirror://sourceforge/tcl/tk8.5.7-src.tar.gz";
+    sha256 = "0c5gsy3nlwl0wn9swz4k4v7phy7nzjl317gca1jykgf4jz9nwdnr";
+  };
+  
+  postInstall = ''
+    ln -s $out/bin/wish* $out/bin/wish
+  '';
+  
+  configureFlags = "--with-tcl=${tcl}/lib";
+  
+  preConfigure = "cd unix";
+
+  buildInputs = [tcl x11];
+  
+  inherit tcl;
+}
-- 
cgit 1.4.1