diff options
author | Armijn Hemel <armijn@gpl-violations.org> | 2008-03-10 20:13:44 +0000 |
---|---|---|
committer | Armijn Hemel <armijn@gpl-violations.org> | 2008-03-10 20:13:44 +0000 |
commit | c16b552bac69b5461dc3e363a3918290233c3c9b (patch) | |
tree | 9c99c24a5e3b767b65fc011b20553a27c8d9042b /pkgs | |
parent | c88710749bcfe68d92fbc26bb68a7640956a1b8c (diff) | |
download | nixlib-c16b552bac69b5461dc3e363a3918290233c3c9b.tar nixlib-c16b552bac69b5461dc3e363a3918290233c3c9b.tar.gz nixlib-c16b552bac69b5461dc3e363a3918290233c3c9b.tar.bz2 nixlib-c16b552bac69b5461dc3e363a3918290233c3c9b.tar.lz nixlib-c16b552bac69b5461dc3e363a3918290233c3c9b.tar.xz nixlib-c16b552bac69b5461dc3e363a3918290233c3c9b.tar.zst nixlib-c16b552bac69b5461dc3e363a3918290233c3c9b.zip |
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
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/liboil/0.3.13.nix (renamed from pkgs/development/libraries/liboil/0.3.12.nix) | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/schroedinger/default.nix | 11 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 7 |
3 files changed, 19 insertions, 3 deletions
diff --git a/pkgs/development/libraries/liboil/0.3.12.nix b/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; |