From 78fbf85483926cc71a3d87a477a3f7d6e466318c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 22 Apr 2009 07:16:45 +0000
Subject: [PATCH] * popt updated to 1.15.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15238
---
 pkgs/development/libraries/popt/builder-1.10.6.sh |  9 ---------
 pkgs/development/libraries/popt/default.nix       | 11 ++++++++++-
 pkgs/development/libraries/popt/popt-1.7.nix      | 15 ---------------
 pkgs/top-level/all-packages.nix                   |  2 +-
 4 files changed, 11 insertions(+), 26 deletions(-)
 delete mode 100644 pkgs/development/libraries/popt/builder-1.10.6.sh
 delete mode 100644 pkgs/development/libraries/popt/popt-1.7.nix

diff --git a/pkgs/development/libraries/popt/builder-1.10.6.sh b/pkgs/development/libraries/popt/builder-1.10.6.sh
deleted file mode 100644
index a62cf96e6434..000000000000
--- a/pkgs/development/libraries/popt/builder-1.10.6.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-source $stdenv/setup
-
-preConfigure() {
-  autoreconf -i
-}
-
-preConfigure=preConfigure
-
-genericBuild
diff --git a/pkgs/development/libraries/popt/default.nix b/pkgs/development/libraries/popt/default.nix
index 3ce48f5b200c..82fa564fa01e 100644
--- a/pkgs/development/libraries/popt/default.nix
+++ b/pkgs/development/libraries/popt/default.nix
@@ -1 +1,10 @@
-import ./popt-1.7.nix
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "popt-1.15";
+  
+  src = fetchurl {
+    url = http://rpm5.org/files/popt/popt-1.15.tar.gz;
+    sha256 = "1wqbcimg4zlfp7261i89s1918a46fjfbvq1a4ij4a6prk27576q6";
+  };
+}
diff --git a/pkgs/development/libraries/popt/popt-1.7.nix b/pkgs/development/libraries/popt/popt-1.7.nix
deleted file mode 100644
index d82fa2b9fc76..000000000000
--- a/pkgs/development/libraries/popt/popt-1.7.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{stdenv, fetchurl, gettext}:
-
-assert gettext != null;
-
-stdenv.mkDerivation {
-  name = "popt-1.7";
-  src = fetchurl {
-    urls = [
-      ftp://distro.ibiblio.org/pub/linux/distributions/pdaxrom/src/popt-1.7.tar.gz
-      http://nixos.org/tarballs/popt-1.7.tar.gz
-    ];
-    md5 = "5988e7aeb0ae4dac8d83561265984cc9";
-  };
-  buildInputs = [gettext];
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 007482688caa..8c0c97e4c96d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3789,7 +3789,7 @@ let
   };
 
   popt = import ../development/libraries/popt {
-    inherit fetchurl stdenv gettext;
+    inherit fetchurl stdenv;
   };
 
   proj = import ../development/libraries/proj.4 {