From 45a3e8580c56af59ca5982cc1d702cd8d9ed30f9 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Tue, 14 Jan 2014 09:44:39 +0100
Subject: [PATCH] mesa: keep llvm versioning outside of expression file

---
 pkgs/development/libraries/mesa/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix             | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 40b94e91a11..aaf15851955 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, intltool, flex, bison, autoreconfHook
 , python, libxml2Python, file, expat, makedepend
-, libdrm, xorg, wayland, udev, llvm_34, libffi
+, libdrm, xorg, wayland, udev, llvm, libffi
 , libvdpau, libelf
 , enableTextureFloats ? false # Texture floats are patented, see docs/patents.txt
 , enableExtraFeatures ? false # not maintained
@@ -85,7 +85,7 @@ stdenv.mkDerivation {
     ++ optionals stdenv.isLinux [libdrm]
     ;
   buildInputs = with xorg; [
-    autoreconfHook intltool expat libxml2Python llvm_34
+    autoreconfHook intltool expat libxml2Python llvm
     libXfixes glproto dri2proto libX11 libXext libxcb libXt
     libffi wayland libvdpau libelf
   ] ++ optionals enableExtraFeatures [ /*libXvMC*/ ]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0a0ac731cd7..0288d98e11c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5244,7 +5244,9 @@ let
 
   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
     then darwinX11AndOpenGL // { driverLink = mesa_noglu; }
     else mesa_original;