From c16b552bac69b5461dc3e363a3918290233c3c9b Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Mon, 10 Mar 2008 20:13:44 +0000
Subject: [PATCH] update liboil to 0.3.13 (and add some (new) missing deps) add
 schroedinger, a free codec (might be moved to its own category instead of
 libs)

svn path=/nixpkgs/trunk/; revision=11043
---
 .../libraries/liboil/{0.3.12.nix => 0.3.13.nix}       |  4 ++--
 pkgs/development/libraries/schroedinger/default.nix   | 11 +++++++++++
 pkgs/top-level/all-packages.nix                       |  7 ++++++-
 3 files changed, 19 insertions(+), 3 deletions(-)
 rename pkgs/development/libraries/liboil/{0.3.12.nix => 0.3.13.nix} (78%)
 create mode 100644 pkgs/development/libraries/schroedinger/default.nix

diff --git a/pkgs/development/libraries/liboil/0.3.12.nix b/pkgs/development/libraries/liboil/0.3.13.nix
similarity index 78%
rename from pkgs/development/libraries/liboil/0.3.12.nix
rename to pkgs/development/libraries/liboil/0.3.13.nix
index 5a04892d5beb..3cb6ad6f9923 100644
--- a/pkgs/development/libraries/liboil/0.3.12.nix
+++ b/pkgs/development/libraries/liboil/0.3.13.nix
@@ -5,12 +5,12 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/download/${name}.tar.gz";
-    sha256 = "0gdmly9sli1918pnb4ds1g38ipxikn651hdss86mp4qlfb8wvqlv";
+    sha256 = "0cndfz98zca40qc1d2waq1dkfx32yscbllbvlnlhjp4cjlkyh9qg";
   };
 
   configureFlags = "--enable-shared --disable-static";
 
-  buildInputs = [pkgconfig];
+  buildInputs = [pkgconfig glib];
 
   meta = {
     homepage = http://liboil.freedesktop.org;
diff --git a/pkgs/development/libraries/schroedinger/default.nix b/pkgs/development/libraries/schroedinger/default.nix
new file mode 100644
index 000000000000..67f026fb4828
--- /dev/null
+++ b/pkgs/development/libraries/schroedinger/default.nix
@@ -0,0 +1,11 @@
+{stdenv, fetchurl, liboil, pkgconfig}:
+
+stdenv.mkDerivation {
+  name = "schroedinger-1.0.0";
+  src = fetchurl {
+    url = mirror://sourceforge/schrodinger/schroedinger-1.0.0.tar.gz;
+    sha256 = "0r374wvc73pfzkcpwk0q0sjx6yhp79acyiqbjy3c7sfqdy7sm4x8";
+  };
+
+  buildInputs = [liboil pkgconfig];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fc92a58fab8b..a31b7280d4de 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2793,8 +2793,9 @@ rec {
   };
 
   liboilFun = lib.sumArgs
-    (selectVersion ../development/libraries/liboil "0.3.12") {
+    (selectVersion ../development/libraries/liboil "0.3.13") {
     inherit fetchurl stdenv pkgconfig;
+    inherit (gtkLibs) glib;
   };
 
   liboil = liboilFun null;
@@ -3100,6 +3101,10 @@ rec {
     inherit fetchurl stdenv;
   };
 
+  schroedinger = import ../development/libraries/schroedinger {
+    inherit fetchurl stdenv liboil pkgconfig;
+  };
+
   SDL = import ../development/libraries/SDL {
     inherit fetchurl stdenv x11 mesa alsaLib;
     inherit (xlibs) libXrandr;