public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/staging' into gcc-4.9

Browse Source 
Conflicts:
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/libraries/wayland/default.nix
	pkgs/development/tools/build-managers/cmake/default.nix
	pkgs/top-level/all-packages.nix
This commit is contained in:
Eelco Dolstra
2015-06-01 20:08:43 +02:00
parent 592d4af9cf 3aee39bb83
commit 553abf71ba
1274 changed files with 28934 additions and 14858 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/libraries/mesa/default.nix
View File

@@ -23,7 +23,7 @@ else
*/
let
version = "10.5.4";
version = "10.5.6";
# this is the default search path for DRI drivers
driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32";
clang = if llvmPackages ? clang-unwrapped then llvmPackages.clang-unwrapped else llvmPackages.clang;
@@ -38,7 +38,7 @@ stdenv.mkDerivation {
"https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz"
"ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz"
];
sha256 = "00v89jna7m6r2w1yrnx09isc97r2bd1hkn4jib445n1078zp47mm";
sha256 = "66017853bde5f7a6647db3eede30512a091a3491daa1708e0ad8027c328ba595";
};
prePatch = "patchShebangs .";
@@ -167,11 +167,11 @@ stdenv.mkDerivation {
passthru = { inherit libdrm version driverLink; };
meta = {
meta = with stdenv.lib; {
description = "An open source implementation of OpenGL";
homepage = http://www.mesa3d.org/;
license = "bsd";
platforms = stdenv.lib.platforms.mesaPlatforms;
maintainers = with stdenv.lib.maintainers; [ eduarrrd simons vcunat ];
platforms = platforms.mesaPlatforms;
maintainers = with maintainers; [ eduarrrd simons vcunat ];
};
}