1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-20 12:42:24 +00:00

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
This commit is contained in:
Armijn Hemel 2008-03-10 20:13:44 +00:00
parent c88710749b
commit c16b552bac
3 changed files with 19 additions and 3 deletions

View file

@ -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;

View file

@ -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];
}

View file

@ -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;