From 13417770a3f6c5b1fc77fa8211505137f1758570 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 27 Jan 2010 12:12:35 +0000
Subject: applying patches provided by griswold

svn path=/nixpkgs/trunk/; revision=19707
---
 pkgs/development/libraries/classads/default.nix    | 22 +++++++++++++++++
 pkgs/development/libraries/gsoap/default.nix       | 19 +++++++++++++++
 pkgs/development/libraries/libvirt/default.nix     | 28 ++++++++++++++++++++++
 .../libraries/libvirt/non-absolute-ld.patch        | 12 ++++++++++
 4 files changed, 81 insertions(+)
 create mode 100644 pkgs/development/libraries/classads/default.nix
 create mode 100644 pkgs/development/libraries/gsoap/default.nix
 create mode 100644 pkgs/development/libraries/libvirt/default.nix
 create mode 100644 pkgs/development/libraries/libvirt/non-absolute-ld.patch

(limited to 'pkgs/development/libraries')

diff --git a/pkgs/development/libraries/classads/default.nix b/pkgs/development/libraries/classads/default.nix
new file mode 100644
index 00000000000..5739690e59a
--- /dev/null
+++ b/pkgs/development/libraries/classads/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl }:
+
+let version = "1.0.4"; in
+
+stdenv.mkDerivation {
+  name = "classads-${version}";
+
+  src = fetchurl {
+    url = "ftp://ftp.cs.wisc.edu/condor/classad/c++/classads-${version}.tar.gz";
+    sha256 = "80b11c6d383891c90e04e403b2f282e91177940c3fe536082899fbfb9e854d24";
+  };
+
+  configureFlags = ''                                                  
+    --enable-namespace --enable-flexible-member
+  '';
+  
+  meta = {
+    homepage = http://www.cs.wisc.edu/condor/classad/;
+    description = "The Classified Advertisements library provides a generic means for matching resources.";
+    license = "Apache-2.0";
+  };
+}
diff --git a/pkgs/development/libraries/gsoap/default.nix b/pkgs/development/libraries/gsoap/default.nix
new file mode 100644
index 00000000000..4d661d4088f
--- /dev/null
+++ b/pkgs/development/libraries/gsoap/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, m4, bison, flex, openssl, zlib }:
+
+let version = "2.7.15"; in
+
+stdenv.mkDerivation {
+  name = "gsoap-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/gsoap2/files/gSOAP/2.7.15%20stable/gsoap_${version}.tar.gz";
+    sha256 = "3ed883ab1a3d32b5bb2bf599306f247f6de3ffedd8890eb0e6303ae15995dc12";
+  };
+
+  buildInputs = [ m4 bison flex openssl zlib ];
+  meta = {
+    homepage = "http://www.cs.fsu.edu/~engelen/soap.html";
+    description = "The gSOAP toolkit is an open source C and C++ software development toolkit for SOAP/WSDL and XML Web services.";
+    license = "free-non-copyleft";
+  };
+}
diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
new file mode 100644
index 00000000000..39539b9ad4b
--- /dev/null
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, libxml2, gnutls, devicemapper, perl }:
+
+let version = "0.7.5"; in
+
+stdenv.mkDerivation {
+  name = "libvirt-${version}";
+
+  src = fetchurl {
+    url = "http://libvirt.org/sources/libvirt-${version}.tar.gz";
+    sha256 = "922481aadf72a74cf14012fe3967c60d01e70f7e88908410d57428943ab4eb8b";
+  };
+
+  buildInputs = [ libxml2 gnutls devicemapper perl ];
+
+  # fix for redhat bz 531496
+  patches = [ ./non-absolute-ld.patch ];
+
+  # xen currently disabled in nixpkgs
+  configureFlags = ''                                                  
+    --without-xen
+  '';
+  
+  meta = {
+    homepage = http://libvirt.org/;
+    description = "A toolkit to interact with the virtualization capabilities of recent versions of Linux (and other OSes).";
+    license = "LGPLv2+";
+  };
+}
diff --git a/pkgs/development/libraries/libvirt/non-absolute-ld.patch b/pkgs/development/libraries/libvirt/non-absolute-ld.patch
new file mode 100644
index 00000000000..ba73010c439
--- /dev/null
+++ b/pkgs/development/libraries/libvirt/non-absolute-ld.patch
@@ -0,0 +1,12 @@
+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,"
+ 
+ 
-- 
cgit 1.4.1