diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2007-02-27 00:18:34 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2007-02-27 00:18:34 +0000 |
| commit | 4788912bdef14ce7c75f41eefac9906d5b489f35 (patch) | |
| tree | 864a70e22abab0cc5a2d6eca824f2077f83fb22a | |
| parent | f6b15579b88771aea8d8189f688f7d3572241a93 (diff) | |
| download | nixlib-4788912bdef14ce7c75f41eefac9906d5b489f35.tar nixlib-4788912bdef14ce7c75f41eefac9906d5b489f35.tar.gz nixlib-4788912bdef14ce7c75f41eefac9906d5b489f35.tar.bz2 nixlib-4788912bdef14ce7c75f41eefac9906d5b489f35.tar.lz nixlib-4788912bdef14ce7c75f41eefac9906d5b489f35.tar.xz nixlib-4788912bdef14ce7c75f41eefac9906d5b489f35.tar.zst nixlib-4788912bdef14ce7c75f41eefac9906d5b489f35.zip | |
* Build a DRI-accelerated Mesa.
svn path=/nixpkgs/trunk/; revision=8066
| -rw-r--r-- | pkgs/development/libraries/mesa/builder.sh | 11 | ||||
| -rw-r--r-- | pkgs/development/libraries/mesa/default.nix | 18 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 16 insertions, 17 deletions
diff --git a/pkgs/development/libraries/mesa/builder.sh b/pkgs/development/libraries/mesa/builder.sh deleted file mode 100644 index 4be0efd6983d..000000000000 --- a/pkgs/development/libraries/mesa/builder.sh +++ /dev/null @@ -1,11 +0,0 @@ -source $stdenv/setup - -buildFlags="linux-x86" - -installPhase=installPhase -installPhase() { - ensureDir $out - ./bin/installmesa $out -} - -genericBuild diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 171d4c255975..a51a914f288a 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -1,6 +1,13 @@ -{stdenv, fetchurl, x11, libXmu, libXi}: +{stdenv, fetchurl, pkgconfig, x11, libXmu, libXi, makedepend, libdrm, glproto, libXxf86vm}: -assert stdenv.system == "i686-linux"; +let + + target = + if stdenv.system == "i686-linux" then "linux-dri-x86" else + if stdenv.system == "x86_64-linux" then "linux-dri-x86-64" else + abort "unsupported platform for Mesa"; + +in stdenv.mkDerivation { name = "mesa-6.5.2"; @@ -8,6 +15,10 @@ stdenv.mkDerivation { url = http://mesh.dl.sourceforge.net/sourceforge/mesa3d/MesaLib-6.5.2.tar.bz2; sha256 = "0pxq3zjfdgcpkc92cyzl9hskdmc8qxxp7b2smywixmb10jim0zqk"; }; + buildFlags = "${target}"; + preBuild = " + makeFlagsArray=(INSTALL_DIR=$out DRI_DRIVER_INSTALL_DIR=$out/lib/modules/dri) + "; /* (fetchurl { url = http://nix.cs.uu.nl/dist/tarballs/MesaGLUT-6.4.tar.bz2; md5 = "1a8c4d4fc699233f5fdb902b8753099e"; @@ -16,6 +27,5 @@ stdenv.mkDerivation { url = http://nix.cs.uu.nl/dist/tarballs/MesaDemos-6.4.tar.bz2; md5 = "1a8c4d4fc699233f5fdb902b8753099e"; }) */ - builder = ./builder.sh; - buildInputs = [x11 libXmu libXi]; + buildInputs = [pkgconfig x11 libXmu libXi makedepend libdrm glproto libXxf86vm]; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3f41657d16a3..5e625a877aee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1571,8 +1571,8 @@ rec { }; mesa = import ../development/libraries/mesa { - inherit fetchurl stdenv x11; - inherit (xlibs) libXmu libXi; + inherit fetchurl stdenv pkgconfig x11 libdrm; + inherit (xlibs) libXmu libXi makedepend glproto libXxf86vm; }; mesaHeaders = import ../development/libraries/mesa/headers.nix { |