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

mesa: keep llvm versioning outside of expression file

Browse Source
This commit is contained in:
Mathijs Kwik 2014-01-14 09:44:39 +01:00
parent 1cb146f3e1
commit 45a3e8580c
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, intltool, flex, bison, autoreconfHook { stdenv, fetchurl, pkgconfig, intltool, flex, bison, autoreconfHook
, python, libxml2Python, file, expat, makedepend , python, libxml2Python, file, expat, makedepend
, libdrm, xorg, wayland, udev, llvm_34, libffi , libdrm, xorg, wayland, udev, llvm, libffi
, libvdpau, libelf , libvdpau, libelf
, enableTextureFloats ? false # Texture floats are patented, see docs/patents.txt , enableTextureFloats ? false # Texture floats are patented, see docs/patents.txt
, enableExtraFeatures ? false # not maintained , enableExtraFeatures ? false # not maintained
@ -85,7 +85,7 @@ stdenv.mkDerivation {
++ optionals stdenv.isLinux [libdrm] ++ optionals stdenv.isLinux [libdrm]
; ;
buildInputs = with xorg; [ buildInputs = with xorg; [
autoreconfHook intltool expat libxml2Python llvm_34 autoreconfHook intltool expat libxml2Python llvm
libXfixes glproto dri2proto libX11 libXext libxcb libXt libXfixes glproto dri2proto libX11 libXext libxcb libXt
libffi wayland libvdpau libelf libffi wayland libvdpau libelf
] ++ optionals enableExtraFeatures [ /*libXvMC*/ ] ] ++ optionals enableExtraFeatures [ /*libXvMC*/ ]

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

@ -5244,7 +5244,9 @@ let
mesaSupported = lib.elem system lib.platforms.mesaPlatforms; mesaSupported = lib.elem system lib.platforms.mesaPlatforms;
mesa_original = callPackage ../development/libraries/mesa { }; mesa_original = callPackage ../development/libraries/mesa {
llvm = llvm_34;
};
mesa_noglu = if stdenv.isDarwin mesa_noglu = if stdenv.isDarwin
then darwinX11AndOpenGL // { driverLink = mesa_noglu; } then darwinX11AndOpenGL // { driverLink = mesa_noglu; }
else mesa_original; else mesa_original;