From 53d79f6f9c02cb0d7e34d18895340a8b0475b10d Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 11 Aug 2010 17:55:31 +0000
Subject: [PATCH] updated libvirt to 0.8.3

svn path=/nixpkgs/trunk/; revision=23124
---
 pkgs/development/libraries/libvirt/default.nix       |  7 ++-----
 .../libraries/libvirt/non-absolute-ld.patch          | 12 ------------
 2 files changed, 2 insertions(+), 17 deletions(-)
 delete mode 100644 pkgs/development/libraries/libvirt/non-absolute-ld.patch

diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index 39539b9ad4bd..e5d288d103b9 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -1,20 +1,17 @@
 { stdenv, fetchurl, libxml2, gnutls, devicemapper, perl }:
 
-let version = "0.7.5"; in
+let version = "0.8.3"; in
 
 stdenv.mkDerivation {
   name = "libvirt-${version}";
 
   src = fetchurl {
     url = "http://libvirt.org/sources/libvirt-${version}.tar.gz";
-    sha256 = "922481aadf72a74cf14012fe3967c60d01e70f7e88908410d57428943ab4eb8b";
+    sha256 = "07vsk4g1nxvxc8yr6cdvwp9kvwgm2g7lh6aaggfkxb2775n87q9m";
   };
 
   buildInputs = [ libxml2 gnutls devicemapper perl ];
 
-  # fix for redhat bz 531496
-  patches = [ ./non-absolute-ld.patch ];
-
   # xen currently disabled in nixpkgs
   configureFlags = ''                                                  
     --without-xen
diff --git a/pkgs/development/libraries/libvirt/non-absolute-ld.patch b/pkgs/development/libraries/libvirt/non-absolute-ld.patch
deleted file mode 100644
index ba73010c4398..000000000000
--- a/pkgs/development/libraries/libvirt/non-absolute-ld.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur libvirt-0.7.5.orig/configure libvirt-0.7.5/configure
---- libvirt-0.7.5.orig/configure	2009-12-23 09:17:34.000000000 -0600
-+++ libvirt-0.7.5/configure	2010-01-13 21:16:02.000000000 -0600
-@@ -41051,7 +41051,7 @@
- 
- 
- VERSION_SCRIPT_FLAGS=-Wl,--version-script=
--`/usr/bin/ld --help 2>&1 | grep -- --version-script >/dev/null` || \
-+`ld --help 2>&1 | grep -- --version-script >/dev/null` || \
-     VERSION_SCRIPT_FLAGS="-Wl,-M -Wl,"
- 
-