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

mesa: append version of mesa_noglu to mesa buildEnv name.

Browse Source
This commit is contained in:
Carles Pagès 2013-03-26 13:01:18 +01:00
parent 33798a9a08
commit ceacc508dc
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,7 +42,7 @@ stdenv.mkDerivation {
enableParallelBuilding = true; enableParallelBuilding = true;
passthru = { inherit libdrm; }; passthru = { inherit libdrm; inherit version; };
meta = { meta = {
description = "An open source implementation of OpenGL"; description = "An open source implementation of OpenGL";

2
pkgs/top-level/all-packages.nix
View File

@ -4568,7 +4568,7 @@ let
mesa_glu = callPackage ../development/libraries/mesa-glu { }; mesa_glu = callPackage ../development/libraries/mesa-glu { };
mesa = if stdenv.isDarwin then darwinX11AndOpenGL mesa = if stdenv.isDarwin then darwinX11AndOpenGL
else buildEnv { else buildEnv {
name = "mesa"; name = "mesa-${mesa_noglu.version}";
paths = [ mesa_glu mesa_noglu ]; paths = [ mesa_glu mesa_noglu ];
}; };
darwinX11AndOpenGL = callPackage ../os-specific/darwin/native-x11-and-opengl { }; darwinX11AndOpenGL = callPackage ../os-specific/darwin/native-x11-and-opengl { };