diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2011-01-12 10:03:37 +0000 |
---|---|---|
committer | Michael Raskin <7c6f434c@mail.ru> | 2011-01-12 10:03:37 +0000 |
commit | 49ff7df6f1b03d4e139fba0ce0f5889840216fc5 (patch) | |
tree | e2f7afd4954418b2620750fc6e4d568af63b6a44 /pkgs | |
parent | 8dc9474e4debd45c3551b74c402f508b08c3cd0c (diff) |
Adding Mesa 7.9 as an option
svn path=/nixpkgs/trunk/; revision=25513
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/mesa/7.9.nix | 36 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 40 insertions, 0 deletions
diff --git a/pkgs/development/libraries/mesa/7.9.nix b/pkgs/development/libraries/mesa/7.9.nix new file mode 100644 index 0000000000000..89652066d17c8 --- /dev/null +++ b/pkgs/development/libraries/mesa/7.9.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, pkgconfig, x11, xlibs, libdrm, expat, lipo ? null, + talloc, python, libxml2, libxml2Python}: + +if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms then + throw "unsupported platform for Mesa" +else + +stdenv.mkDerivation rec { + version = "7.9"; + name = "mesa-${version}"; + + src = fetchurl { + url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2"; + sha256 = "1wr927mdghn7w1cmp0bxswjda5s2x0hwfpf8zcc9x03da7s6gkg0"; + }; + + configureFlags = + "--disable-gallium" + + (if stdenv.system == "mips64-linux" then + " --with-dri-drivers=swrast --with-driver=dri" else "") + + (if stdenv.isDarwin then " --disable-egl" else ""); + + buildInputs = + [ pkgconfig expat x11 libdrm xlibs.glproto + xlibs.libXxf86vm xlibs.libXfixes xlibs.libXdamage xlibs.dri2proto + lipo talloc python libxml2 libxml2Python + ]; + + passthru = { inherit libdrm; }; + + meta = { + description = "An open source implementation of OpenGL"; + homepage = http://www.mesa3d.org/; + license = "bsd"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c6ba7bde4f76c..ccb76748ffb40 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3741,6 +3741,10 @@ let mesa = callPackage ../development/libraries/mesa { lipo = if stdenv.isDarwin then darwinLipoUtility else null; }; + mesa_7_9 = callPackage ../development/libraries/mesa/7.9.nix { + lipo = if stdenv.isDarwin then darwinLipoUtility else null; + }; + metaEnvironment = recurseIntoAttrs (let callPackage = newScope pkgs.metaEnvironment; in rec { sdfLibrary = callPackage ../development/libraries/sdf-library { aterm = aterm28; }; |